Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 03:26:30 +0000 (04:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 03:29:59 +0000 (04:29 +0100)
commita459891e624c7b7670f888498df9c137b6ad6111
treed4161af5065be35651a8cd15d797dd2d6e128a88
parent1c7d2870440fcf3c11dadb8b060cc8ee0ffeafc5
parentdd2d0039b6405dc724e4fef0d5b8f49530eea3aa
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1: Always reset numref when parsing a new frame header.

Conflicts:
libavcodec/vc1.c

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