[FFmpeg-cvslog] Merge commit 'ce57531a8894d69e3da085c7c6cba45b1f133b35' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 21:36:47 2015 +0100| [99ba7ee0eba556cdc7484152d5a9b3a80b9fe6de] | committer: Michael Niedermayer

Merge commit 'ce57531a8894d69e3da085c7c6cba45b1f133b35' into release/0.10

* commit 'ce57531a8894d69e3da085c7c6cba45b1f133b35':
  swscale: Remove two bogus asserts

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

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