aboutsummaryrefslogtreecommitdiffstats
path: root/tools/ismindex.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-14 02:10:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-14 02:10:43 +0200
commitd794b7db1453ada81c49ae03e777250b5c2868c6 (patch)
tree67ed04875db0777ef699f5a289a7266160e1b4e5 /tools/ismindex.c
parentfb8a10db5d77424774493376b5d0412808bb0491 (diff)
parent1b20d0f581f01f2df601c9e68d0d321672d97af7 (diff)
downloadffmpeg-d794b7db1453ada81c49ae03e777250b5c2868c6.tar.gz
Merge commit '1b20d0f581f01f2df601c9e68d0d321672d97af7'
* commit '1b20d0f581f01f2df601c9e68d0d321672d97af7': cavs: Return meaningful error values Conflicts: libavcodec/cavsdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/ismindex.c')
0 files changed, 0 insertions, 0 deletions