virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

fftools/ffmpeg_mux_init: drop an always-false check

Browse Source 
It cannot be true since 1959351aec. Effectively reverts 6a3833e141.
This commit is contained in:
Anton Khirnov
2022-11-14 15:56:20 +01:00
parent 13947aff3f
commit b58264217b
4 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fftools/ffmpeg.h
View File

@@ -674,7 +674,6 @@ extern HWDevice *filter_hw_device;
extern unsigned nb_output_dumped; extern unsigned nb_output_dumped;
extern int main_return_code; extern int main_return_code;
extern int input_stream_potentially_available;
extern int ignore_unknown_streams; extern int ignore_unknown_streams;
extern int copy_unknown_streams; extern int copy_unknown_streams;

2
fftools/ffmpeg_demux.c
View File

@@ -1098,7 +1098,5 @@ int ifile_open(const OptionsContext *o, const char *filename)
} }
} }
input_stream_potentially_available = 1;
return 0; return 0;
} }

6
fftools/ffmpeg_mux_init.c
View File

@@ -1911,12 +1911,6 @@ int of_open(const OptionsContext *o, const char *filename)
} }
} }
if (!(oc->oformat->flags & AVFMT_NOSTREAMS) && !input_stream_potentially_available) {
av_log(NULL, AV_LOG_ERROR,
"No input streams but output needs an input stream\n");
exit_program(1);
}
if (!(oc->oformat->flags & AVFMT_NOFILE)) { if (!(oc->oformat->flags & AVFMT_NOFILE)) {
/* test if it already exists to avoid losing precious files */ /* test if it already exists to avoid losing precious files */
assert_file_overwrite(filename); assert_file_overwrite(filename);

5
fftools/ffmpeg_opt.c
View File

@@ -95,7 +95,6 @@ static int no_file_overwrite = 0;
#if FFMPEG_OPT_PSNR #if FFMPEG_OPT_PSNR
int do_psnr = 0; int do_psnr = 0;
#endif #endif
int input_stream_potentially_available = 0;
int ignore_unknown_streams = 0; int ignore_unknown_streams = 0;
int copy_unknown_streams = 0; int copy_unknown_streams = 0;
int recast_media = 0; int recast_media = 0;
@@ -1114,8 +1113,6 @@ static int opt_filter_complex(void *optctx, const char *opt, const char *arg)
if (!fg->graph_desc) if (!fg->graph_desc)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
input_stream_potentially_available = 1;
return 0; return 0;
} }
@@ -1130,8 +1127,6 @@ static int opt_filter_complex_script(void *optctx, const char *opt, const char *
fg->index = nb_filtergraphs - 1; fg->index = nb_filtergraphs - 1;
fg->graph_desc = graph_desc; fg->graph_desc = graph_desc;
input_stream_potentially_available = 1;
return 0; return 0;
} }