Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-10 19:51:58 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-06-18 23:35:54 +0400
commiteec55e622a73b298bd8872a82dc116b3633c14e4 (patch)
treea1ecc9a3dfca32b98d322c19ed463f773b2a14aa /ffmpeg_opt.c
parent1d54f5108477938268d51162be536cecd746e56a (diff)
ffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are streams
This allows "-codec copy -f framecrc" on files with only unindentifyable streams Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
-rw-r--r--ffmpeg_opt.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 887752d8c1..f7473fa243 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -888,8 +888,10 @@ static int open_input_file(OptionsContext *o, const char *filename)
ret = avformat_find_stream_info(ic, opts);
if (ret < 0) {
av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename);
- avformat_close_input(&ic);
- exit_program(1);
+ if (ic->nb_streams == 0) {
+ avformat_close_input(&ic);
+ exit_program(1);
+ }
}
timestamp = (o->start_time == AV_NOPTS_VALUE) ? 0 : o->start_time;