ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7e0356cc33297d8db12b56051841f914b6f1ba9
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
