ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Wed Nov 11 01:51:52 2015 +0100| [8f3a9603538b8633fb873fcee7ffcec72e849c42] | committer: Michael Niedermayer
ffmpeg_filter: remove redundant null ptr check Fixes: CID1338331 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f3a9603538b8633fb873fcee7ffcec72e849c42 --- ffmpeg_filter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 9142a97..bf484bb 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -1053,8 +1053,7 @@ int configure_filtergraph(FilterGraph *fg) avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index); return AVERROR(EINVAL); } - if (ost && - ost->enc->type == AVMEDIA_TYPE_AUDIO && + if (ost->enc->type == AVMEDIA_TYPE_AUDIO && !(ost->enc->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) av_buffersink_set_frame_size(ost->filter->filter, ost->enc_ctx->frame_size); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
