Changeset 79f77ce3 in ffmpeg

Timestamp:

Nov 25, 2014, 11:00:11 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0e85a28f

Parents:

ed25ca16 (diff), d25afb5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/25/14 10:57:57)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/25/14 11:00:11)

Message:

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@gmx.at>

(No files)