[FFmpeg-cvslog] Merge commit 'c28ed1d743443e783537d279ae721be3bbdf7646'
Michael Niedermayer
git at videolan.org
Sun Mar 22 00:00:26 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at 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 <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa7c08d5e192aea77fdfb7f52c44c196a3ba4452
---
More information about the ffmpeg-cvslog
mailing list