[FFmpeg-cvslog] Merge commit '02ec656af72030eea4f3d63e30b25625cce6a3df'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 30 13:22:24 2013 +0200| [c1fc4ff937cd923dd8221ce8dcbf3d7fd6cecb76] | committer: Michael Niedermayer

Merge commit '02ec656af72030eea4f3d63e30b25625cce6a3df'

* commit '02ec656af72030eea4f3d63e30b25625cce6a3df':
  wmapro: error out on impossible scale factor offsets

The check is replaced by an assert(), as the condition cannot be
true except through bugs elsewhere (which should have been fixed
already)

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

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