* 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>
* commit 'b67138598ce158e3083f6295a27b63e2065d5ecb':
vc1: Simplify a little setting the intra variables
Conflicts:
libavcodec/vc1_block.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Keep the code as similar as possible across the codepaths to
ease spotting it for factorization.
Based on a patch from Michael Niedermayer <michaelni@gmx.at>.
The code currently set the information in at least 4 places, spare
some pointless loops.
Make the code in the loop a little uniform to make easier factorize
it out later.
