[FFmpeg-cvslog] Merge commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd'
Michael Niedermayer
git at videolan.org
Sat Mar 21 18:18:38 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 18:07:01 2015 +0100| [9d0450ae943a7d1071fa59bfd0c4f7647d733c5f] | committer: Michael Niedermayer
Merge commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd'
* commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd':
h264: move mb_mbaff into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d0450ae943a7d1071fa59bfd0c4f7647d733c5f
---
More information about the ffmpeg-cvslog
mailing list