Merge commit 'b67138598ce158e3083f6295a27b63e2065d5ecb'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 10:33:51 +0000 (11:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 10:33:51 +0000 (11:33 +0100)
commited25ca16617121b382a961980707844fafcf82f8
treeea582f538fe589342d6f861a164901627fd68941
parentbcccb2c2986bca9307b66a8d681addad54c786ff
parentb67138598ce158e3083f6295a27b63e2065d5ecb
Merge commit 'b67138598ce158e3083f6295a27b63e2065d5ecb'

* commit 'b67138598ce158e3083f6295a27b63e2065d5ecb':
  vc1: Simplify a little setting the intra variables

Conflicts:
libavcodec/vc1_block.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vc1_block.c