[FFmpeg-cvslog] Merge commit '9951907f6fc37a8d41566dbee09f7c15ff587de6'
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:07:53 2015 +0100| [da7f4c32ab6bf517d4ef51297da46cf459479b22] | committer: Michael Niedermayer
Merge commit '9951907f6fc37a8d41566dbee09f7c15ff587de6'
* commit '9951907f6fc37a8d41566dbee09f7c15ff587de6':
h264: move redundant_pic_count into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da7f4c32ab6bf517d4ef51297da46cf459479b22
---
More information about the ffmpeg-cvslog
mailing list