Merge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 00:59:04 +0000 (02:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 01:00:04 +0000 (03:00 +0200)
* commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71':
  vc1dec: Redesign the intensity compensation

Conflicts:
libavcodec/vc1.c
libavcodec/vc1dec.c

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

Simple merge