[FFmpeg-cvslog] ffmpeg: Remove redundant null check

Michael Niedermayer git at videolan.org
Mon Feb 6 02:02:23 EET 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Feb  6 00:00:56 2017 +0100| [dfc6e30cd4b9d1817b78579c11fc6881e40b9733] | committer: Michael Niedermayer

ffmpeg: Remove redundant null check

Fixes CID1396245

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/ffmpeg.c b/ffmpeg.c
index 8d1abc5..06570c0 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3141,7 +3141,7 @@ static int init_output_stream_encode(OutputStream *ost)
                    ost->file_index, ost->index);
         }
 //      ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1};
-        if (ost->enc && ost->enc->supported_framerates && !ost->force_fps) {
+        if (ost->enc->supported_framerates && !ost->force_fps) {
             int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
             ost->frame_rate = ost->enc->supported_framerates[idx];
         }



More information about the ffmpeg-cvslog mailing list