[FFmpeg-cvslog] Merge commit '47a0d393504d6726c4a235951153bee0abb3f7d6'
Michael Niedermayer
git at videolan.org
Sat Mar 21 16:18:12 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 16:09:14 2015 +0100| [70eec8f432dcee5b9867ba01a26436a04a9a0423] | committer: Michael Niedermayer
Merge commit '47a0d393504d6726c4a235951153bee0abb3f7d6'
* commit '47a0d393504d6726c4a235951153bee0abb3f7d6':
h264: move mb_skip_run into the per-slice context
Conflicts:
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70eec8f432dcee5b9867ba01a26436a04a9a0423
---
More information about the ffmpeg-cvslog
mailing list