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)
commitcb22692f05f916ba521a88e198fa8d15f92c9303
tree979d4ab2a6d360e99c3f0dcfb65c20bd2f7da048
parentb602e47f12d72b383d986d66212341af31c9bc82
parentfe06795d783785a76c6cbcaa2cd3012e6deb5fa5
Merge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5'

* commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5':
  vc1: implement frame interlaced b-frame header parsing

Conflicts:
libavcodec/vc1.c

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