summaryrefslogtreecommitdiffstats
path: root/cfg-mencoder.h
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-27 22:43:20 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-27 22:43:20 +0000
commitbf46a109ede5d25f506cc75ae80fe1acc5b34edd (patch)
treea2cd8454df8950c0ab1ced5add63f293ea35d242 /cfg-mencoder.h
parentbc9afe8d39c9e12596677be1141f8098fec73db6 (diff)
downloadmpv-bf46a109ede5d25f506cc75ae80fe1acc5b34edd.tar.bz2
mpv-bf46a109ede5d25f506cc75ae80fe1acc5b34edd.tar.xz
the long-waited MUXER layer, and new MPEG-PS muxer
patch by Andriy N. Gritsenko <andrej@lucky.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8586 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mencoder.h')
-rw-r--r--cfg-mencoder.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index 37660d38a1..51c694999c 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -129,6 +129,16 @@ struct config info_conf[]={
{NULL, NULL, 0, 0, 0, 0, NULL}
};
+struct config of_conf[]={
+ {"avi", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_AVI, NULL},
+ {"mpeg", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_MPEG, NULL},
+ {"help", "\nAvailable output formats:\n"
+ " avi - Microsoft Audio/Video Interleaved\n"
+ " mpeg - MPEG-1 system stream format\n"
+ "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+ {NULL, NULL, 0, 0, 0, 0, NULL}
+};
+
static config_t mencoder_opts[]={
/* name, pointer, type, flags, min, max */
{"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this must be the first!!! */
@@ -156,6 +166,9 @@ static config_t mencoder_opts[]={
{"oac", oac_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
{"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+ // output file format
+ {"of", of_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+
// override FOURCC in output file
{"ffourcc", &force_fourcc, CONF_TYPE_STRING, 0, 4, 4, NULL},