ffmpeg | branch: master | Nicolas George <geo...@nsup.org> | Sun Oct 25 19:48:10 2015 +0100| [e8e7eb150f152c9e4858ef0be3e76e4f98533cf6] | committer: Nicolas George
ffmpeg_filter: check encoder before using it to set frame size. Fix a segfault when no encoder is found for a default codec with a complex filter graph. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8e7eb150f152c9e4858ef0be3e76e4f98533cf6 --- ffmpeg_filter.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 10b2f5f..9142a97 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -1046,6 +1046,13 @@ int configure_filtergraph(FilterGraph *fg) for (i = 0; i < fg->nb_outputs; i++) { OutputStream *ost = fg->outputs[i]->ost; + if (!ost->enc) { + /* identical to the same check in ffmpeg.c, needed because + complex filter graphs are initialized earlier */ + av_log(NULL, AV_LOG_ERROR, "Encoder (codec %s) not found for output stream #%d:%d\n", + avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index); + return AVERROR(EINVAL); + } if (ost && ost->enc->type == AVMEDIA_TYPE_AUDIO && !(ost->enc->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
