aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpeg4video_parser.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-15 12:19:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-15 12:23:27 +0100
commitd2f9b9da03626bf94dac27d471114b867bacb1ed (patch)
tree07e9c701ea655416b1a0678980b96d97a8f7de13 /libavcodec/mpeg4video_parser.c
parent0c7733904e54472fa5bea04b4a7c35ff6fea9890 (diff)
parent5a82ad644f281701eb22e0359fd732fac67aafa4 (diff)
downloadffmpeg-d2f9b9da03626bf94dac27d471114b867bacb1ed.tar.gz
Merge commit '5a82ad644f281701eb22e0359fd732fac67aafa4'
* commit '5a82ad644f281701eb22e0359fd732fac67aafa4': svq1dec: Unbreak the scratch buffer allocation Conflicts: libavcodec/svq1dec.c See: 4213fc5b9eebec53c7d22b770c3f1ceecca1c113 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video_parser.c')
0 files changed, 0 insertions, 0 deletions