Merge commit 'd25afb579facc83fd3a839f21411124d0b09f0ba'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 10:57:57 +0000 (11:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 11:00:11 +0000 (12:00 +0100)
* 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>
1  2 
libavcodec/vc1_block.c

Simple merge