Merge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 07:57:28 +0000 (09:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 07:57:28 +0000 (09:57 +0200)
* commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5':
  vc1: implement frame interlaced b-frame header parsing

Conflicts:
libavcodec/vc1.c

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

Simple merge