summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authorivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-04 22:59:33 +0000
committerivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-04 22:59:33 +0000
commitf36b6cd3a1883f7d4be8c7f9c7276c1d79704df2 (patch)
tree6421643ebdc7b3524c5295486d9b9f407095cde4 /cfg-mplayer.h
parentc20f06b2fa04783fb1ba91685d627d63fa29eb76 (diff)
downloadmpv-f36b6cd3a1883f7d4be8c7f9c7276c1d79704df2.tar.bz2
mpv-f36b6cd3a1883f7d4be8c7f9c7276c1d79704df2.tar.xz
Removal of -jpeg commandline option.
It's replaced by an options parser in the module itself. Instead of mplayer -vo jpeg -jpeg options one now has to use mplayer -vo jpeg:options. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13248 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h29
1 files changed, 2 insertions, 27 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 0536f592f8..b0498a4552 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -29,16 +29,6 @@ extern char *dfb_params;
#ifdef HAVE_PNG
extern int z_compression;
#endif
-#ifdef HAVE_JPEG
-extern int jpeg_baseline;
-extern int jpeg_progressive_mode;
-extern int jpeg_optimize;
-extern int jpeg_smooth;
-extern int jpeg_quality;
-extern char * jpeg_outdir;
-extern char * jpeg_subdirs;
-extern int jpeg_maxfiles;
-#endif
#ifdef HAVE_SDL
//extern char *sdl_driver;
extern int sdl_noxv;
@@ -144,22 +134,6 @@ m_option_t ao_plugin_conf[]={
{NULL, NULL, 0, 0, 0, 0, NULL}
};
-#ifdef HAVE_JPEG
-m_option_t jpeg_conf[]={
- {"progressive", &jpeg_progressive_mode, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"noprogressive", &jpeg_progressive_mode, CONF_TYPE_FLAG, 0, 1, 0, NULL},
- {"baseline", &jpeg_baseline, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"nobaseline", &jpeg_baseline, CONF_TYPE_FLAG, 0, 1, 0, NULL},
- {"optimize", &jpeg_optimize, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
- {"smooth", &jpeg_smooth, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
- {"quality", &jpeg_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
- {"outdir", &jpeg_outdir, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"subdirs", &jpeg_subdirs, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"maxfiles", &jpeg_maxfiles, CONF_TYPE_INT, CONF_MIN, 1, 0, NULL},
- {NULL, NULL, 0, 0, 0, 0, NULL}
-};
-#endif
-
extern int sws_flags;
extern int readPPOpt(void *conf, char *arg);
extern void revertPPOpt(void *conf, char* opt);
@@ -228,7 +202,8 @@ m_option_t mplayer_opts[]={
#endif
// -vo jpeg only:
#ifdef HAVE_JPEG
- {"jpeg", jpeg_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL},
+ {"jpeg", "-jpeg is deprecated. Use -vo jpeg:options instead.\n",
+ CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif
// -vo sdl only:
#ifdef HAVE_SDL