ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Mar 21
18:47:19 2015 +0100| [3d1d8e1f95e1cb6682a6dd035046d91a0812d331] | committer:
Michael Niedermayer
Merge commit '36d04801ba9d8622c2d759c172aea18561bac74d'
* commit '36d04801ba9d8622c2d759c172aea18561bac74d':
h264: move the scratch buffers into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d1d8e1f95e1cb6682a6dd035046d91a0812d331
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
