Merge commit '3ea49fc5081d63277ecbc12ed440af4b02ddfdf9' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 01:16:15 +0000 (02:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 01:17:20 +0000 (02:17 +0100)
* commit '3ea49fc5081d63277ecbc12ed440af4b02ddfdf9':
  vc1: Do not assume seek happens after decoding

See: 6801eb0a0981f113f5f09ed4799d9ae805af62a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge