aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg_filter.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-11-11 01:51:52 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-11 01:51:52 +0100
commit8f3a9603538b8633fb873fcee7ffcec72e849c42 (patch)
tree3ffadc5d4fde4ec878811db8d4fb90c1271d6ebc /ffmpeg_filter.c
parent1b539fbfe36c450a6f45706e740fd4e205b8be16 (diff)
downloadandroid_external_ffmpeg-8f3a9603538b8633fb873fcee7ffcec72e849c42.tar.gz
android_external_ffmpeg-8f3a9603538b8633fb873fcee7ffcec72e849c42.tar.bz2
android_external_ffmpeg-8f3a9603538b8633fb873fcee7ffcec72e849c42.zip
ffmpeg_filter: remove redundant null ptr check
Fixes: CID1338331 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffmpeg_filter.c')
-rw-r--r--ffmpeg_filter.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 9142a97e8f..bf484bb859 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);