annotate cfg-mencoder.h @ 25263:96d0992c7920

Remove hardcoded key->cmd bindings in libmenu, support custom key bindings by menu config file.
author ulion
date Tue, 04 Dec 2007 10:42:59 +0000
parents 7c82d9df9c38
children 6ac1ece1f9fe
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
1
2618
47a338888698 mencoder commandline handling
arpi
parents:
diff changeset
2 /*
47a338888698 mencoder commandline handling
arpi
parents:
diff changeset
3 * config for cfgparser
47a338888698 mencoder commandline handling
arpi
parents:
diff changeset
4 */
47a338888698 mencoder commandline handling
arpi
parents:
diff changeset
5
2790
98769cea155c added tv subsystem
alex
parents: 2661
diff changeset
6 #include "cfg-common.h"
98769cea155c added tv subsystem
alex
parents: 2661
diff changeset
7
3272
7e4399d1eb65 horizontal up/downscale linear & cubic
michael
parents: 3236
diff changeset
8 extern int sws_flags;
3771
a14b3a600b81 new -pp options stuff (-npp ...)
michael
parents: 3663
diff changeset
9 extern int readPPOpt(void *, char *arg);
4256
bbaa26821fdf Added reverting support for -aa* -zr* -pp and -npp options
albeu
parents: 4207
diff changeset
10 extern void revertPPOpt(void *conf, char* opt);
8736
michael
parents: 8585
diff changeset
11 extern char *pp_help;
3272
7e4399d1eb65 horizontal up/downscale linear & cubic
michael
parents: 3236
diff changeset
12
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 14964
diff changeset
13 extern m_option_t lameopts_conf[];
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10562
diff changeset
14 extern m_option_t lavcopts_conf[];
13426
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
15 extern m_option_t toolameopts_conf[];
15359
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
16 extern m_option_t twolameopts_conf[];
15259
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
17 extern m_option_t faacopts_conf[];
25230
66f140bbe1bc Remove pointless ifdefs around extern declarations
reimar
parents: 22244
diff changeset
18 extern m_option_t vfwopts_conf[];
66f140bbe1bc Remove pointless ifdefs around extern declarations
reimar
parents: 22244
diff changeset
19 extern m_option_t xvidencopts_conf[];
15259
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
20
25233
7c82d9df9c38 Make the main m_option_t arrays const
reimar
parents: 25231
diff changeset
21 extern void x264enc_set_param(const m_option_t* opt, char* arg);
7457
c65cb0d256c3 Support for XviD encoding
kmkaplan
parents: 7145
diff changeset
22
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10562
diff changeset
23 extern m_option_t nuvopts_conf[];
14753
70c446099f40 new mpeg muxer compatible with dvd/[s]vcd; small changes in the muxer layer (sanity checks in the muxer_init functions)
nicodvb
parents: 13426
diff changeset
24 extern m_option_t mpegopts_conf[];
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents: 14753
diff changeset
25 extern m_option_t lavfopts_conf[];
9520
2860f7c9d9ca A new nuppel video encoder. Mainly for RT encoding on slow box.
albeu
parents: 9300
diff changeset
26
25233
7c82d9df9c38 Make the main m_option_t arrays const
reimar
parents: 25231
diff changeset
27 const m_option_t ovc_conf[]={
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
28 {"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
29 {"frameno", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_FRAMENO, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
30 {"lavc", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBAVCODEC, NULL},
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5390
diff changeset
31 // {"null", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NULL, NULL},
11966
b58fdd5d8e8d remove raw nonsense and replace it by one ovc
attila
parents: 11922
diff changeset
32 {"raw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAW, NULL},
4575
0245a06f9efd VfW encoding support (very alpha yet)
arpi
parents: 4427
diff changeset
33 {"vfw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_VFW, NULL},
5578
acfcb903b778 -ovc libdv support
arpi
parents: 5553
diff changeset
34 {"libdv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBDV, NULL},
7457
c65cb0d256c3 Support for XviD encoding
kmkaplan
parents: 7145
diff changeset
35 {"xvid", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_XVID, NULL},
8471
0b7839c27be9 Sorenson 1/3 encoding just for fun :)
arpi
parents: 8298
diff changeset
36 {"qtvideo", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_QTVIDEO, NULL},
9520
2860f7c9d9ca A new nuppel video encoder. Mainly for RT encoding on slow box.
albeu
parents: 9300
diff changeset
37 {"nuv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NUV, NULL},
13166
d198f255bee9 x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
iive
parents: 12489
diff changeset
38 {"x264", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_X264, NULL},
6923
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6862
diff changeset
39 {"help", "\nAvailable codecs:\n"
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
40 " copy - frame copy, without re-encoding. Doesn't work with filters.\n"
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
41 " frameno - special audio-only file for 3-pass encoding, see DOCS.\n"
11966
b58fdd5d8e8d remove raw nonsense and replace it by one ovc
attila
parents: 11922
diff changeset
42 " raw - uncompressed video. Use fourcc option to set format explicitly.\n"
22244
675574bebb04 Make liblzo conditional to the appropriate #defines.
diego
parents: 20901
diff changeset
43 #ifdef USE_LIBLZO
10668
f2961e14874e 10l forgot to add nuv to the help message
albeu
parents: 10594
diff changeset
44 " nuv - nuppel video\n"
22244
675574bebb04 Make liblzo conditional to the appropriate #defines.
diego
parents: 20901
diff changeset
45 #endif
5678
8849904de1db -ovc help fixed
arpi
parents: 5629
diff changeset
46 #ifdef USE_LIBAVCODEC
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
47 " lavc - libavcodec codecs - best quality!\n"
5678
8849904de1db -ovc help fixed
arpi
parents: 5629
diff changeset
48 #endif
8849904de1db -ovc help fixed
arpi
parents: 5629
diff changeset
49 #ifdef USE_WIN32DLL
18433
83c42ca135c4 fix vfw-related things, patches by RC and Compn
gpoirier
parents: 18312
diff changeset
50 " vfw - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n"
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
51 " qtvideo - QuickTime DLLs, currently only SVQ1/3 are supported.\n"
5678
8849904de1db -ovc help fixed
arpi
parents: 5629
diff changeset
52 #endif
8849904de1db -ovc help fixed
arpi
parents: 5629
diff changeset
53 #ifdef HAVE_LIBDV095
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
54 " libdv - DV encoding with libdv v0.9.5\n"
5678
8849904de1db -ovc help fixed
arpi
parents: 5629
diff changeset
55 #endif
11436
6afc2d6f5a08 XviD Api4 support
iive
parents: 11375
diff changeset
56 #if defined(HAVE_XVID3) || defined(HAVE_XVID4)
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
57 " xvid - XviD encoding\n"
7457
c65cb0d256c3 Support for XviD encoding
kmkaplan
parents: 7145
diff changeset
58 #endif
13166
d198f255bee9 x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
iive
parents: 12489
diff changeset
59 #ifdef HAVE_X264
d198f255bee9 x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
iive
parents: 12489
diff changeset
60 " x264 - H.264 encoding\n"
d198f255bee9 x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
iive
parents: 12489
diff changeset
61 #endif
5678
8849904de1db -ovc help fixed
arpi
parents: 5629
diff changeset
62 "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
63 {NULL, NULL, 0, 0, 0, 0, NULL}
2661
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2643
diff changeset
64 };
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2643
diff changeset
65
25233
7c82d9df9c38 Make the main m_option_t arrays const
reimar
parents: 25231
diff changeset
66 const m_option_t oac_conf[]={
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
67 {"copy", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_COPY, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
68 {"pcm", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_PCM, NULL},
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3272
diff changeset
69 #ifdef HAVE_MP3LAME
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
70 {"mp3lame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_VBRMP3, NULL},
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3272
diff changeset
71 #else
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
72 {"mp3lame", "MPlayer was compiled without libmp3lame support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3272
diff changeset
73 #endif
11375
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11261
diff changeset
74 #ifdef USE_LIBAVCODEC
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11261
diff changeset
75 {"lavc", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_LAVC, NULL},
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11261
diff changeset
76 #else
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
77 {"lavc", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
11375
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11261
diff changeset
78 #endif
13426
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
79 #ifdef HAVE_TOOLAME
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
80 {"toolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TOOLAME, NULL},
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
81 #else
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
82 {"toolame", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
83 #endif
15359
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
84 #ifdef HAVE_TWOLAME
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
85 {"twolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TWOLAME, NULL},
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
86 #else
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
87 {"twolame", "MPlayer was compiled without libtwolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
88 #endif
15259
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
89 #ifdef HAVE_FAAC
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
90 {"faac", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_FAAC, NULL},
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
91 #else
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
92 {"faac", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
93 #endif
6923
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6862
diff changeset
94 {"help", "\nAvailable codecs:\n"
8567
917130ff78bb Three typos, two of them noticed by Arpad Biro <biro_arpad@yahoo.com>.
diego
parents: 8517
diff changeset
95 " copy - frame copy, without re-encoding (useful for AC3)\n"
6923
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6862
diff changeset
96 " pcm - uncompressed PCM audio\n"
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6862
diff changeset
97 #ifdef HAVE_MP3LAME
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6862
diff changeset
98 " mp3lame - cbr/abr/vbr MP3 using libmp3lame\n"
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6862
diff changeset
99 #endif
11375
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11261
diff changeset
100 #ifdef USE_LIBAVCODEC
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
101 " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n"
11375
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11261
diff changeset
102 #endif
13426
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
103 #ifdef HAVE_TOOLAME
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
104 " toolame - Toolame MP2 audio encoder\n"
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
105 #endif
15359
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
106 #ifdef HAVE_TWOLAME
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
107 " twolame - Twolame MP2 audio encoder\n"
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
108 #endif
15259
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
109 #ifdef HAVE_FAAC
15359
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
110 " faac - FAAC AAC audio encoder\n"
15259
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
111 #endif
6923
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6862
diff changeset
112 "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
113 {NULL, NULL, 0, 0, 0, 0, NULL}
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2618
diff changeset
114 };
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2618
diff changeset
115
25233
7c82d9df9c38 Make the main m_option_t arrays const
reimar
parents: 25231
diff changeset
116 const m_option_t info_conf[]={
7145
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
117 {"name", &info_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
118 {"artist", &info_artist, CONF_TYPE_STRING, 0, 0, 0, NULL},
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
119 {"genre", &info_genre, CONF_TYPE_STRING, 0, 0, 0, NULL},
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
120 {"subject", &info_subject, CONF_TYPE_STRING, 0, 0, 0, NULL},
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
121 {"copyright", &info_copyright, CONF_TYPE_STRING, 0, 0, 0, NULL},
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
122 {"srcform", &info_sourceform, CONF_TYPE_STRING, 0, 0, 0, NULL},
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
123 {"comment", &info_comment, CONF_TYPE_STRING, 0, 0, 0, NULL},
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
124 {"help", "\nAvailable INFO fields:\n"
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
125 " name - title of the work\n"
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
126 " artist - artist or author of the work\n"
7145
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
127 " genre - original work category\n"
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
128 " subject - contents of the work\n"
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
129 " copyright - copyright information\n"
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
130 " srcform - original format of the digitzed material\n"
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
131 " comment - general comments about the work\n"
7145
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
132 "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
133 {NULL, NULL, 0, 0, 0, 0, NULL}
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
134 };
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
135
25233
7c82d9df9c38 Make the main m_option_t arrays const
reimar
parents: 25231
diff changeset
136 const m_option_t of_conf[]={
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8568
diff changeset
137 {"avi", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_AVI, NULL},
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8568
diff changeset
138 {"mpeg", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_MPEG, NULL},
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16981
diff changeset
139 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents: 14753
diff changeset
140 {"lavf", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_LAVF, NULL},
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents: 14753
diff changeset
141 #endif
12016
b962aaad2940 rawvideo muxer patch by John Earl <jwe21@cam.ac.uk>
ranma
parents: 11966
diff changeset
142 {"rawvideo", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_RAWVIDEO, NULL},
15754
7b0599d9614a rawaudio muxer
ranma
parents: 15541
diff changeset
143 {"rawaudio", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_RAWAUDIO, NULL},
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8568
diff changeset
144 {"help", "\nAvailable output formats:\n"
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8568
diff changeset
145 " avi - Microsoft Audio/Video Interleaved\n"
14771
26557a239706 The MPEG muxer now supports MPEG-2 as well.
diego
parents: 14757
diff changeset
146 " mpeg - MPEG-1/2 system stream format\n"
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16981
diff changeset
147 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
15532
f05963f1dff6 Document lavf muxers.
diego
parents: 15359
diff changeset
148 " lavf - FFmpeg libavformat muxers\n"
15541
18cb1e836289 Surround lavf in the '-of help' output by #ifdef USE_LIBAVFORMAT.
diego
parents: 15532
diff changeset
149 #endif
12016
b962aaad2940 rawvideo muxer patch by John Earl <jwe21@cam.ac.uk>
ranma
parents: 11966
diff changeset
150 " rawvideo - (video only, one stream only) raw stream, no muxing\n"
15754
7b0599d9614a rawaudio muxer
ranma
parents: 15541
diff changeset
151 " rawaudio - (audio only, one stream only) raw stream, no muxing\n"
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8568
diff changeset
152 "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8568
diff changeset
153 {NULL, NULL, 0, 0, 0, 0, NULL}
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8568
diff changeset
154 };
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8568
diff changeset
155
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
156 extern float avi_aspect_override; /* defined in libmpdemux/muxer_avi.c */
12363
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12355
diff changeset
157 extern int write_odml; /* defined in libmpdemux/muxer_avi.c */
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
158
25233
7c82d9df9c38 Make the main m_option_t arrays const
reimar
parents: 25231
diff changeset
159 const m_option_t mencoder_opts[]={
2618
47a338888698 mencoder commandline handling
arpi
parents:
diff changeset
160 /* name, pointer, type, flags, min, max */
47a338888698 mencoder commandline handling
arpi
parents:
diff changeset
161
16528
c1267de1d7d9 Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents: 15992
diff changeset
162 {"frameno-file", &frameno_filename, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
c1267de1d7d9 Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents: 15992
diff changeset
163
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14802
diff changeset
164 {"hr-edl-seek", &edl_seek_type, CONF_TYPE_FLAG, 0, 0, 1, NULL},
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14802
diff changeset
165 {"nohr-edl-seek", &edl_seek_type, CONF_TYPE_FLAG, 0, 1, 0, NULL},
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14802
diff changeset
166
12408
ad1a2bad9248 typos, wording and mistakes pointed out by the wanderer
diego
parents: 12407
diff changeset
167 // set output framerate - recommended for variable-FPS (ASF etc) files
ad1a2bad9248 typos, wording and mistakes pointed out by the wanderer
diego
parents: 12407
diff changeset
168 // and for 29.97FPS progressive MPEG2 streams
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
169 {"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN|CONF_GLOBAL, 0, 0, NULL},
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
170 {"o", &out_filename, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2618
diff changeset
171
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5922
diff changeset
172 // limit number of skippable frames after a non-skipped one
5629
9b422f216fb5 -skiplimit/-noskip options to disable fps correction
arpi
parents: 5626
diff changeset
173 {"skiplimit", &skip_limit, CONF_TYPE_INT, 0, 0, 0, NULL},
9b422f216fb5 -skiplimit/-noskip options to disable fps correction
arpi
parents: 5626
diff changeset
174 {"noskiplimit", &skip_limit, CONF_TYPE_FLAG, 0, 0, -1, NULL},
9b422f216fb5 -skiplimit/-noskip options to disable fps correction
arpi
parents: 5626
diff changeset
175 {"noskip", &skip_limit, CONF_TYPE_FLAG, 0, 0, 0, NULL},
9b422f216fb5 -skiplimit/-noskip options to disable fps correction
arpi
parents: 5626
diff changeset
176
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
177 {"audio-density", &audio_density, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 1, 50, NULL},
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
178 {"audio-preload", &audio_preload, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0, 2, NULL},
17648
5963b50c2178 dwStart support for mencoder.
corey
parents: 17354
diff changeset
179 {"audio-delay", &audio_delay_fix, CONF_TYPE_FLOAT, CONF_GLOBAL, 0, 0, NULL},
6861
79f54159ca15 audio preload/density/delay configurable
arpi
parents: 6674
diff changeset
180
20901
b875b84a511e Clarify messages for unavailable options.
diego
parents: 20317
diff changeset
181 {"x", "-x has been removed, use -vf scale=w:h for scaling.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
b875b84a511e Clarify messages for unavailable options.
diego
parents: 20317
diff changeset
182 {"xsize", "-xsize has been removed, use -vf crop=w:h:x:y for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
5270
870e932096ff Support for cropping in mencoder. New options:
ksorim
parents: 5259
diff changeset
183
8567
917130ff78bb Three typos, two of them noticed by Arpad Biro <biro_arpad@yahoo.com>.
diego
parents: 8517
diff changeset
184 // output audio/video codec selection
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
185 {"oac", oac_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
186 {"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2626
diff changeset
187
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8568
diff changeset
188 // output file format
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
189 {"of", of_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8568
diff changeset
190
15888
da752f91c5f2 Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents: 15754
diff changeset
191 // override audio format tag in output file
da752f91c5f2 Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents: 15754
diff changeset
192 {"fafmttag", &force_audiofmttag, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5922
diff changeset
193 // override FOURCC in output file
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
194 {"ffourcc", &force_fourcc, CONF_TYPE_STRING, CONF_GLOBAL, 4, 4, NULL},
3657
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3480
diff changeset
195
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
196 // override avi aspect autodetection
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
197 {"force-avi-aspect", &avi_aspect_override, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0.2, 3.0, NULL},
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
198
20901
b875b84a511e Clarify messages for unavailable options.
diego
parents: 20317
diff changeset
199 {"pass", "-pass has been removed, use -lavcopts vpass=n, -xvidencopts pass=n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
200 {"passlogfile", &passtmpfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2618
diff changeset
201
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
202 {"vobsubout", &vobsub_out, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
203 {"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 31, NULL},
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
204 {"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6671
diff changeset
205
9076
92014b66ed3d ability to disable the nonsense expand filter is a must! otherwise
rfelker
parents: 8896
diff changeset
206 {"autoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 0, 1, NULL},
92014b66ed3d ability to disable the nonsense expand filter is a must! otherwise
rfelker
parents: 8896
diff changeset
207 {"noautoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 1, 0, NULL},
92014b66ed3d ability to disable the nonsense expand filter is a must! otherwise
rfelker
parents: 8896
diff changeset
208
12355
ba3b91392d92 oops, forgot this with the softskip patch
rfelker
parents: 12061
diff changeset
209 {"encodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 0, 1, NULL},
ba3b91392d92 oops, forgot this with the softskip patch
rfelker
parents: 12061
diff changeset
210 {"noencodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 1, 0, NULL},
ba3b91392d92 oops, forgot this with the softskip patch
rfelker
parents: 12061
diff changeset
211
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
212 {"odml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
213 {"noodml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
12363
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12355
diff changeset
214
7145
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
215 // info header strings
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
216 {"info", info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
7145
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 6923
diff changeset
217
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3272
diff changeset
218 #ifdef HAVE_MP3LAME
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
219 {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3272
diff changeset
220 #endif
3657
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3480
diff changeset
221 #ifdef USE_LIBAVCODEC
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
222 {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
9099
905a741d5dd6 error msg for -alvcopts if no libavcodec avail
arpi
parents: 9076
diff changeset
223 #else
12407
574b1ed2f9a3 spelling, wording, consistency in comments and printed messages
diego
parents: 12363
diff changeset
224 {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
3657
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3480
diff changeset
225 #endif
13426
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
226 #ifdef HAVE_TOOLAME
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
227 {"toolameopts", toolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
13426
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
228 #else
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
229 {"toolameopts", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
230 #endif
15359
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
231 #ifdef HAVE_TWOLAME
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
232 {"twolameopts", twolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
233 #else
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
234 {"twolameopts", "MPlayer was compiled without libtwolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
235 #endif
15259
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
236 #ifdef HAVE_FAAC
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
237 {"faacopts", faacopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
238 #else
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
239 {"faacopts", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
240 #endif
3657
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3480
diff changeset
241 #ifdef USE_WIN32DLL
16617
bc9bf383f0f7 A long-standing bug... -vfwopts in cfg-mencoder.h is being overridden
diego
parents: 16528
diff changeset
242 {"xvfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
3657
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3480
diff changeset
243 #endif
11436
6afc2d6f5a08 XviD Api4 support
iive
parents: 11375
diff changeset
244 #if defined(HAVE_XVID3) || defined(HAVE_XVID4)
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
245 {"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
7457
c65cb0d256c3 Support for XviD encoding
kmkaplan
parents: 7145
diff changeset
246 #endif
13166
d198f255bee9 x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
iive
parents: 12489
diff changeset
247 #if defined(HAVE_X264)
20252
eaaf13b39595 fix multiple instances of -x264encopts on the commandline (broke in r20060)
lorenm
parents: 20054
diff changeset
248 {"x264encopts", &x264enc_set_param, CONF_TYPE_FUNC_PARAM, CONF_GLOBAL, 0, 0, NULL},
13166
d198f255bee9 x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
iive
parents: 12489
diff changeset
249 #endif
2618
47a338888698 mencoder commandline handling
arpi
parents:
diff changeset
250
22244
675574bebb04 Make liblzo conditional to the appropriate #defines.
diego
parents: 20901
diff changeset
251 #ifdef USE_LIBLZO
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
252 {"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
22244
675574bebb04 Make liblzo conditional to the appropriate #defines.
diego
parents: 20901
diff changeset
253 #endif
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
254 {"mpegopts", mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16981
diff changeset
255 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14771
diff changeset
256 {"lavfopts", lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents: 14753
diff changeset
257 #endif
9520
2860f7c9d9ca A new nuppel video encoder. Mainly for RT encoding on slow box.
albeu
parents: 9300
diff changeset
258
2790
98769cea155c added tv subsystem
alex
parents: 2661
diff changeset
259 #define MAIN_CONF
2618
47a338888698 mencoder commandline handling
arpi
parents:
diff changeset
260 #include "cfg-common.h"
2790
98769cea155c added tv subsystem
alex
parents: 2661
diff changeset
261 #undef MAIN_CONF
2618
47a338888698 mencoder commandline handling
arpi
parents:
diff changeset
262
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
263 // {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
264 // {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
265 // {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 3771
diff changeset
266 {NULL, NULL, 0, 0, 0, 0, NULL}
2618
47a338888698 mencoder commandline handling
arpi
parents:
diff changeset
267 };