aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-21 23:32:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-21 23:32:39 +0100
commit70974bdb278373e346bcc3fd59c9e413f8055fa5 (patch)
treecb17160746ab3e8fcb3244231bb43fd645b15ad9
parentcf14c822275301209c307fb35351d5c9833b7a3b (diff)
downloadffmpeg-70974bdb278373e346bcc3fd59c9e413f8055fa5.tar.gz
ffmpeg: Fix segfault when using ffmpeg with ffserver where ffmpeg does not supply all requested streams.
Fixes Ticket675 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 623716a14e..8935b17056 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3935,6 +3935,10 @@ static void opt_output_file(void *optctx, const char *filename)
break;
}
}
+ if(!ost->sync_ist){
+ av_log(NULL, AV_LOG_FATAL, "Missing %s stream which is required by this ffm\n", av_get_media_type_string(ost->st->codec->codec_type));
+ exit_program(1);
+ }
}
} else if (!o->nb_stream_maps) {
/* pick the "best" stream of each type */