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