summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-19 19:16:32 +0000
committercompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-19 19:16:32 +0000
commit584cefe84f7515ae0acfdf0dd95855975910aff5 (patch)
treeaa36e0cc12966414dbc27a3f7eb7a785a6393c39 /etc
parentd9d88dd59c5cd812874c7da3541ec38332b16b21 (diff)
downloadmpv-584cefe84f7515ae0acfdf0dd95855975910aff5.tar.bz2
mpv-584cefe84f7515ae0acfdf0dd95855975910aff5.tar.xz
sync with libavformat/riff.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27642 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 6b705721ae..c89999fff4 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -772,6 +772,7 @@ videocodec ffodivx
fourcc SMP4,smp4 ; Samsung SMP4 video codec
fourcc VIDM ; vidm 4.01 codec
format 0x10000004 ; mpeg 4 es
+ fourcc 4000,BLZ0
driver ffmpeg
dll mpeg4 ;opendivx
out YV12,I420,IYUV
@@ -1020,6 +1021,7 @@ videocodec ffmjpeg
fourcc JPGL ; lossless JPEG (pegasus codec)
fourcc LJPG ; lossless JPEG
fourcc dmb1 ; MJPEG by Matrox Rainbow Runner
+ fourcc MJLS ; JPEG-LS custom FOURCC for avi - encoder
driver ffmpeg
dll mjpeg
out 444P
@@ -1369,6 +1371,7 @@ videocodec ffdv
fourcc AVdv,AVd1
fourcc dvhq,dvhp
fourcc dvh5,dvh6,dvh3
+ fourcc dvhd,dvsl,dv25
driver ffmpeg
dll dvvideo
out 411P,422P,YV12