ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Mar 21
14:37:55 2015 +0100| [4ffbeddd35cb6a365a3db85bb2bdf2084fb1ba55] | committer:
Michael Niedermayer
Merge commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6'
* commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6':
h264: move sub_mb_type into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ffbeddd35cb6a365a3db85bb2bdf2084fb1ba55
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
