ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Mar 21
14:16:29 2015 +0100| [2cc08cad9ecf2d2524bc572a4e9bbe659b330d5c] | committer:
Michael Niedermayer
Merge commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999'
* commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999':
h264: move mb_[uv]linesize into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cc08cad9ecf2d2524bc572a4e9bbe659b330d5c
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
