aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/options.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-16 12:38:55 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-16 12:39:02 +0200
commit91248f081f343cde894a9c60624b6f4dc4581c94 (patch)
treea60c5ee84c0ae56eb907e55c415cdc6630cbdf49 /libswscale/options.c
parent83bfcc3ce2554bd12d5eb790836530d3430bd908 (diff)
parentb81dbd6cb7522bea96d78a52f8a4c25a47b820c9 (diff)
downloadffmpeg-91248f081f343cde894a9c60624b6f4dc4581c94.tar.gz
Merge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'
* commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9': h264_parser: Fix POC parsing for the case where MMCO_RESET is absent. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/options.c')
0 files changed, 0 insertions, 0 deletions