aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/parseutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-30 04:21:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-30 04:23:43 +0100
commitae4e7f7ba603a1624d4aaeee2c368677739b7322 (patch)
tree29ea5c72f1e2be65b88f16a5974d7e50851cb594 /libavutil/parseutils.c
parentb27ba2e540b873fe8e50280a734194ada002a077 (diff)
parent58c120a9290eef057dbf26761a4f89b7f67bbde1 (diff)
downloadffmpeg-ae4e7f7ba603a1624d4aaeee2c368677739b7322.tar.gz
Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'
* commit '58c120a9290eef057dbf26761a4f89b7f67bbde1': mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions