ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Dec 15
12:19:16 2014 +0100| [d2f9b9da03626bf94dac27d471114b867bacb1ed] | committer:
Michael Niedermayer
Merge commit '5a82ad644f281701eb22e0359fd732fac67aafa4'
* commit '5a82ad644f281701eb22e0359fd732fac67aafa4':
svq1dec: Unbreak the scratch buffer allocation
Conflicts:
libavcodec/svq1dec.c
See: 4213fc5b9eebec53c7d22b770c3f1ceecca1c113
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2f9b9da03626bf94dac27d471114b867bacb1ed
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
