summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-05-26 01:02:16 +0000
committercompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-05-26 01:02:16 +0000
commitf3d29882972ec21956adff440823950c8c3a6b82 (patch)
treeecf32d414d920d57a984aa3e2f4ae2f6848d5581 /etc
parent3f7f582557feb12237174a19e0c0dbfcf307b194 (diff)
downloadmpv-f3d29882972ec21956adff440823950c8c3a6b82.tar.bz2
mpv-f3d29882972ec21956adff440823950c8c3a6b82.tar.xz
add dvh1 fourcc to ffdv codec, fixes dvh1_sample_truncated.avi
and Mp42 fourcc to ffmp42 codec, fixes unknown_audio_codec.avi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29324 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 6cd7fd64e7..26119070f5 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -777,7 +777,7 @@ videocodec ffmp42
info "FFmpeg MSMPEG-4 v2"
status working
fourcc DIV2,div2 mp42
- fourcc MP42,mp42
+ fourcc MP42,mp42,Mp42
driver ffmpeg
dll msmpeg4v2
out YV12,I420,IYUV
@@ -1546,7 +1546,7 @@ videocodec ffdv
fourcc dvhq,dvhp
fourcc dvh5,dvh6,dvh3
fourcc dvhd,dvsl,dv25
- fourcc dvs1
+ fourcc dvs1,dvh1
driver ffmpeg
dll dvvideo
out 411P,422P,YV12