From 835147130718c591834a519e2c8c97df2d3e114b Mon Sep 17 00:00:00 2001
From: Fabrice Bellard <fabrice@bellard.org>
Date: Tue, 15 Oct 2002 10:14:05 +0000
Subject: [PATCH] suppressed vcd flag - use new mpeg mux format instead
Originally committed as revision 1041 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
ffmpeg.c | 4 ----
libav/avformat.h | 1 -
2 files changed, 5 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index eaa95b5dd9a..e58f9df3c0a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -141,7 +141,6 @@ static int do_hex_dump = 0;
static int do_play = 0;
static int do_psnr = 0;
static int do_vstats = 0;
-static int mpeg_vcd = 0;
static int do_pass = 0;
static char *pass_logfilename = NULL;
static int audio_stream_copy = 0;
@@ -692,8 +691,6 @@ static int av_encode(AVFormatContext **output_files,
for(i=0;i<nb_output_files;i++) {
os = output_files[i];
nb_ostreams += os->nb_streams;
- if (mpeg_vcd)
- os->flags |= AVF_FLAG_VCD;
}
if (nb_stream_maps > 0 && nb_stream_maps != nb_ostreams) {
fprintf(stderr, "Number of stream maps must match number of output streams\n");
@@ -2366,7 +2363,6 @@ const OptionDef options[] = {
{ "h", 0, {(void*)show_help}, "show help" },
{ "formats", 0, {(void*)show_formats}, "show available formats, codecs, protocols, ..." },
{ "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" },
{ "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" },
{ "map", HAS_ARG | OPT_EXPERT, {(void*)opt_map}, "set input stream mapping", "file:stream" },
diff --git a/libav/avformat.h b/libav/avformat.h
index 7ce160ffeda..2fb64e4d26a 100644
--- a/libav/avformat.h
+++ b/libav/avformat.h
@@ -169,7 +169,6 @@ extern AVOutputFormat *first_oformat;
/* modules */
/* mpeg.c */
-#define AVF_FLAG_VCD 0x00000001 /* VCD compatible MPEG-PS */
int mpegps_init(void);
/* mpegts.c */
--
GitLab