[FFmpeg-cvslog] Merge commit '68211c70afcfd4d675029cc85fba7dee8de53bdf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct  5 02:57:37 2014 +0200| [de52af90172154168ef1a64b1392187767b0dd60] | committer: Michael Niedermayer

Merge commit '68211c70afcfd4d675029cc85fba7dee8de53bdf'

* commit '68211c70afcfd4d675029cc85fba7dee8de53bdf':
  vc1: Do not assume seek happens after decoding

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de52af90172154168ef1a64b1392187767b0dd60
---