[FFmpeg-cvslog] Merge commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 12:10:17 2013 +0100| [8c63ee4296a87d1fdbbce5501230b6fd9c8d04d8] | committer: Michael Niedermayer

Merge commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0'

* commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0':
  motionpixels: clip VLC codes.

Not merged, the change is wrong, the condition is not possible unless
there are serious bugs elsewhere. No such bugs should exist in ffmpeg.

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

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