summaryrefslogtreecommitdiffstats
path: root/codec-cfg.c
diff options
context:
space:
mode:
authorrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-04 20:02:09 +0000
committerrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-04 20:02:09 +0000
commit96dfb6e86021b3f734d0c132000a92c322f9ba89 (patch)
treee163d0c94dc77cff221a837328377e75285d3330 /codec-cfg.c
parenta67c3d4c592c7f903a6743dba24c22fb83bf1fe7 (diff)
downloadmpv-96dfb6e86021b3f734d0c132000a92c322f9ba89.tar.bz2
mpv-96dfb6e86021b3f734d0c132000a92c322f9ba89.tar.xz
updates for new image formats for zoran mjpeg passthrough
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11389 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'codec-cfg.c')
-rw-r--r--codec-cfg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/codec-cfg.c b/codec-cfg.c
index 223a8952a0..13071675d7 100644
--- a/codec-cfg.c
+++ b/codec-cfg.c
@@ -160,6 +160,9 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int
{"BGR1", IMGFMT_BGR|1},
{"MPES", IMGFMT_MPEGPES},
+ {"ZRMJPEGNI", IMGFMT_ZRMJPEGNI},
+ {"ZRMJPEGIT", IMGFMT_ZRMJPEGIT},
+ {"ZRMJPEGIB", IMGFMT_ZRMJPEGIB},
{"IDCT_MPEG2",IMGFMT_XVMC_IDCT_MPEG2},
{"MOCO_MPEG2",IMGFMT_XVMC_MOCO_MPEG2},
@@ -289,6 +292,7 @@ static short get_driver(char *s,int audioflag)
"ijpg",
"zlib",
"mpegpes",
+ "zrmjpeg",
"realvid",
"xvid",
"libdv",