aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/tscc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-13 19:59:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-13 19:59:41 +0200
commitfb6dd77000f1ad6740494269f55a0ff21df5bcf2 (patch)
tree35c3a454ba49c5229bb894de0e6b90c7c50c6fcd /libavcodec/tscc.c
parentf4f3065c69cefd916c92ee2a8758bac799a30c00 (diff)
parent73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc (diff)
downloadffmpeg-fb6dd77000f1ad6740494269f55a0ff21df5bcf2.tar.gz
Merge commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc'
* commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc': ffv1: Check memory allocations Conflicts: libavcodec/ffv1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tscc.c')
0 files changed, 0 insertions, 0 deletions