summaryrefslogtreecommitdiffstats
path: root/etc/codecs.conf
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 15:27:58 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 15:27:58 +0300
commit6f199ab3d97a1a5831f261fd5fc46d592ae1cdff (patch)
treea785da88f8fc1ffd73619d528bfac70a795d2f51 /etc/codecs.conf
parent18657beb190b3e4acc6404c3b87e6eafbd22de3c (diff)
parent8c9cb24a48373330e9bfd4568eb7987890b19f8f (diff)
downloadmpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.bz2
mpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.xz
Merge svn changes up to r31169
Diffstat (limited to 'etc/codecs.conf')
-rw-r--r--etc/codecs.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index a941116227..a2d384bd15 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2130,7 +2130,8 @@ videocodec ffvp6a
videocodec ffvp6f
info "FFmpeg VP6 Flash"
status working
- fourcc VP6F,FLV4
+ fourcc VP6F
+ fourcc FLV4
driver ffmpeg
dll "vp6f"
out YV12