From: Matthieu Bouron <matthieu.bouron@stupeflix.com>
Date: Wed, 13 Jul 2016 15:39:47 +0000 (+0200)
Subject: Merge commit 'ec9f04423b82afa323e90f5b2c677be74302c1fd'
X-Git-Tag: android-x86-7.1-r1~4440
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=57fa9608e419ddc377d04f508329595ec1e027cb;p=android-x86%2Fexternal-ffmpeg.git

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@stupeflix.com>
---

57fa9608e419ddc377d04f508329595ec1e027cb