[FFmpeg-cvslog] Merge commit 'ec9f04423b82afa323e90f5b2c677be74302c1fd'

[Matthieu Bouron]

ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at stupeflix.com> | Wed Jul 13 17:39:47 2016 +0200| [57fa9608e419ddc377d04f508329595ec1e027cb] | committer: Matthieu Bouron

Merge commit 'ec9f04423b82afa323e90f5b2c677be74302c1fd'

* commit 'ec9f04423b82afa323e90f5b2c677be74302c1fd':
  ffv1: Error out on unsupported format

This commit is a noop, the feature is already present in FFmpeg.

Merged-by: Matthieu Bouron <matthieu.bouron at stupeflix.com>

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