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