[FFmpeg-cvslog] Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 20 21:59:24 2014 +0200| [2e0ac145d56fa37ae9f3624c702d9b88dcfb3298] | committer: Michael Niedermayer

Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'

* commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04':
  vf_format: check input validity

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

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