Commit 83514713 authored by Fabrice Bellard's avatar Fabrice Bellard
Browse files

suppressed vcd flag - use new mpeg mux format instead

Originally committed as revision 1041 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b71c30be
...@@ -141,7 +141,6 @@ static int do_hex_dump = 0; ...@@ -141,7 +141,6 @@ static int do_hex_dump = 0;
static int do_play = 0; static int do_play = 0;
static int do_psnr = 0; static int do_psnr = 0;
static int do_vstats = 0; static int do_vstats = 0;
static int mpeg_vcd = 0;
static int do_pass = 0; static int do_pass = 0;
static char *pass_logfilename = NULL; static char *pass_logfilename = NULL;
static int audio_stream_copy = 0; static int audio_stream_copy = 0;
...@@ -692,8 +691,6 @@ static int av_encode(AVFormatContext **output_files, ...@@ -692,8 +691,6 @@ static int av_encode(AVFormatContext **output_files,
for(i=0;i<nb_output_files;i++) { for(i=0;i<nb_output_files;i++) {
os = output_files[i]; os = output_files[i];
nb_ostreams += os->nb_streams; nb_ostreams += os->nb_streams;
if (mpeg_vcd)
os->flags |= AVF_FLAG_VCD;
} }
if (nb_stream_maps > 0 && nb_stream_maps != nb_ostreams) { if (nb_stream_maps > 0 && nb_stream_maps != nb_ostreams) {
fprintf(stderr, "Number of stream maps must match number of output streams\n"); fprintf(stderr, "Number of stream maps must match number of output streams\n");
...@@ -2366,7 +2363,6 @@ const OptionDef options[] = { ...@@ -2366,7 +2363,6 @@ const OptionDef options[] = {
{ "h", 0, {(void*)show_help}, "show help" }, { "h", 0, {(void*)show_help}, "show help" },
{ "formats", 0, {(void*)show_formats}, "show available formats, codecs, protocols, ..." }, { "formats", 0, {(void*)show_formats}, "show available formats, codecs, protocols, ..." },
{ "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" }, { "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
{ "vcd", OPT_BOOL, {(void*)&mpeg_vcd}, "output Video CD MPEG-PS compliant file" },
{ "i", HAS_ARG, {(void*)opt_input_file}, "input file name", "filename" }, { "i", HAS_ARG, {(void*)opt_input_file}, "input file name", "filename" },
{ "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" }, { "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" },
{ "map", HAS_ARG | OPT_EXPERT, {(void*)opt_map}, "set input stream mapping", "file:stream" }, { "map", HAS_ARG | OPT_EXPERT, {(void*)opt_map}, "set input stream mapping", "file:stream" },
......
...@@ -169,7 +169,6 @@ extern AVOutputFormat *first_oformat; ...@@ -169,7 +169,6 @@ extern AVOutputFormat *first_oformat;
/* modules */ /* modules */
/* mpeg.c */ /* mpeg.c */
#define AVF_FLAG_VCD 0x00000001 /* VCD compatible MPEG-PS */
int mpegps_init(void); int mpegps_init(void);
/* mpegts.c */ /* mpegts.c */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment