[FFmpeg-cvslog] Merge commit 'd25afb579facc83fd3a839f21411124d0b09f0ba'
Michael Niedermayer
git at videolan.org
Tue Nov 25 12:05:43 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 25 11:57:57 2014 +0100| [79f77ce31c6cbe2c8c1163862acdaf2014a85458] | committer: Michael Niedermayer
Merge commit 'd25afb579facc83fd3a839f21411124d0b09f0ba'
* commit 'd25afb579facc83fd3a839f21411124d0b09f0ba':
vc1: Set the is_intra bitfield to all 1 when needed
Conflicts:
libavcodec/vc1_block.c
See: 04152a31cb41a7ca3cc0bde9d962454fc30bab9c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79f77ce31c6cbe2c8c1163862acdaf2014a85458
---
More information about the ffmpeg-cvslog
mailing list