summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-13 19:27:39 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-13 19:27:39 +0000
commit916b2289769cbb8ac873586d1ba8296abcaab592 (patch)
treeaa5bc34bb0f69a9448dfc2711a748a53add72512 /etc
parent49a5caf4740946983ca385071a6899db2cf6168f (diff)
downloadmpv-916b2289769cbb8ac873586d1ba8296abcaab592.tar.bz2
mpv-916b2289769cbb8ac873586d1ba8296abcaab592.tar.xz
added JFIF and UMP4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7385 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 7065a486f5..4e7704cfde 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -279,6 +279,7 @@ videocodec ffodivx
fourcc DX50,BLZ0 DX50
fourcc mp4v
format 0x4
+ fourcc UMP4
driver ffmpeg
dll mpeg4 ;opendivx
out YV12,I420,IYUV
@@ -456,6 +457,7 @@ videocodec ffmjpeg
fourcc AVRn,AVDJ ; AVID
fourcc jpeg ; photo-jpeg
fourcc mjpa ; Apple MJPEG-A (Quicktime)
+ fourcc JFIF ; SMJPEG (Loki)
driver ffmpeg
dll mjpeg
out 422P