summaryrefslogtreecommitdiffstats
path: root/codec-cfg.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-31 05:02:38 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-31 16:03:11 +0200
commit626d5ed6285309da621a5665ad9eb03c227ce71d (patch)
tree384b1e5838162d6bccc4ee4b6de7c476e1827894 /codec-cfg.c
parentb138ca43caee2115778ad9e039dcfdeddf5bfbb9 (diff)
downloadmpv-626d5ed6285309da621a5665ad9eb03c227ce71d.tar.bz2
mpv-626d5ed6285309da621a5665ad9eb03c227ce71d.tar.xz
vo_zr2: drop Zoran support
There were multiple files specific to Zoran support, and they also depended on internal FFmpeg headers (so it would probably have been hard to get them to compile now even if you tried). It's obsolete now, so just drop the whole mess.
Diffstat (limited to 'codec-cfg.c')
-rw-r--r--codec-cfg.c71
1 files changed, 0 insertions, 71 deletions
diff --git a/codec-cfg.c b/codec-cfg.c
index 84402ada7b..a7d958ebc1 100644
--- a/codec-cfg.c
+++ b/codec-cfg.c
@@ -212,9 +212,6 @@ static const struct {
{"BGR1", IMGFMT_BGR1},
{"MPES", IMGFMT_MPEGPES},
- {"ZRMJPEGNI", IMGFMT_ZRMJPEGNI},
- {"ZRMJPEGIT", IMGFMT_ZRMJPEGIT},
- {"ZRMJPEGIB", IMGFMT_ZRMJPEGIB},
{"IDCT_MPEG2",IMGFMT_XVMC_IDCT_MPEG2},
{"MOCO_MPEG2",IMGFMT_XVMC_MOCO_MPEG2},
@@ -296,74 +293,6 @@ err_out_parse_error:
return 0;
}
-#if 0
-static short get_driver(char *s,int audioflag)
-{
- static char *audiodrv[] = {
- "null",
- "mp3lib",
- "pcm",
- "libac3",
- "acm",
- "alaw",
- "msgsm",
- "dshow",
- "dvdpcm",
- "hwac3",
- "libvorbis",
- "ffmpeg",
- "libmad",
- "msadpcm",
- "liba52",
- "g72x",
- "imaadpcm",
- "dk4adpcm",
- "dk3adpcm",
- "roqaudio",
- "faad",
- "realaud",
- "libdv",
- NULL
- };
- static char *videodrv[] = {
- "null",
- "libmpeg2",
- "vfw",
- "dshow",
- "ffmpeg",
- "vfwex",
- "raw",
- "msrle",
- "xanim",
- "msvidc",
- "fli",
- "cinepak",
- "qtrle",
- "nuv",
- "cyuv",
- "qtsmc",
- "ducktm1",
- "roqvideo",
- "qtrpza",
- "mpng",
- "ijpg",
- "zlib",
- "mpegpes",
- "zrmjpeg",
- "realvid",
- "xvid",
- "libdv",
- NULL
- };
- char **drv=audioflag?audiodrv:videodrv;
- int i;
-
- for(i=0;drv[i];i++) if(!strcmp(s,drv[i])) return i;
-
- return -1;
-}
-#endif
-
static int validate_codec(codecs_t *c, int type)
{
unsigned int i;