From: Hendrik Leppkes Date: Mon, 14 Nov 2016 09:03:30 +0000 (+0100) Subject: Merge commit 'fe6e5cbea7dbd5d2c67d79b5570e26debb70e95b' X-Git-Tag: android-x86-7.1-r1~3113 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5a45f4d2b74b93997c28a3238b8f55fa628158b5;p=android-x86%2Fexternal-ffmpeg.git Merge commit 'fe6e5cbea7dbd5d2c67d79b5570e26debb70e95b' * commit 'fe6e5cbea7dbd5d2c67d79b5570e26debb70e95b': ffv1: Remove version 2 and mark version 3 as non-experimental Noop, our ffv1 decoder is far more advanced and version 3 has been stable for a while. Merged-by: Hendrik Leppkes --- 5a45f4d2b74b93997c28a3238b8f55fa628158b5