summaryrefslogtreecommitdiffstats
path: root/etc/codecs.conf
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-04-07 10:14:06 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-04-07 10:14:06 +0000
commit9e56d70e6ff1c4c6ae4e8e229990e6b8ad643804 (patch)
treeb7775626bb06e9abad11d2556b3c7dc613f3d11d /etc/codecs.conf
parent82d566fc4d863da4e759f8b5f7dd7d4703b9a364 (diff)
downloadmpv-9e56d70e6ff1c4c6ae4e8e229990e6b8ad643804.tar.bz2
mpv-9e56d70e6ff1c4c6ae4e8e229990e6b8ad643804.tar.xz
forgot to commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9868 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc/codecs.conf')
-rw-r--r--etc/codecs.conf9
1 files changed, 9 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 657b2b6c0b..b822563a00 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -305,6 +305,15 @@ videocodec ffwmv2
dll wmv2
out YV12,I420,IYUV
+videocodec ffh264
+ info "FFmpeg H.264"
+ status working
+ fourcc H264,h264
+ format 0x10000005
+ driver ffmpeg
+ dll h264
+ out YV12,I420,IYUV
+
videocodec ffodivx
info "FFmpeg MPEG-4"
status working