[FFmpeg-cvslog] ffmpeg: Remove another unneeded ost->filter_graph check

Michael Niedermayer git at videolan.org
Fri May 15 23:52:59 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 15 22:30:42 2015 +0200| [3a91a07f15e89633c49ab8f6ea08f9ea4a2696d0] | committer: Michael Niedermayer

ffmpeg: Remove another unneeded ost->filter_graph check

Fixes CID1241508

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a91a07f15e89633c49ab8f6ea08f9ea4a2696d0
---

 ffmpeg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 877e914..49a4326 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2849,7 +2849,7 @@ static int transcode_init(void)
             }
 
             if (enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO) {
-                if (ost->filter && !ost->frame_rate.num)
+                if (!ost->frame_rate.num)
                     ost->frame_rate = av_buffersink_get_frame_rate(ost->filter->filter);
                 if (ist && !ost->frame_rate.num)
                     ost->frame_rate = ist->framerate;



More information about the ffmpeg-cvslog mailing list