]> git.sesse.net Git - ffmpeg/commitdiff
lavf/dv: do not check for c->sys
authorClément Bœsch <u@pkh.me>
Sun, 20 Mar 2016 13:24:53 +0000 (14:24 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 20 Mar 2016 13:25:16 +0000 (14:25 +0100)
dv_extract_video_info() is a static function called only from
avpriv_dv_produce_packet(), where c->sys is made sure to be set.

libavformat/dv.c

index 84c306114b6701119c8520342090801d9604a9e2..b1f8759dbeabcbc493ac75a8b8d966f13d5c5261 100644 (file)
@@ -284,9 +284,7 @@ static int dv_extract_video_info(DVDemuxContext *c, const uint8_t *frame)
     const uint8_t *vsc_pack;
     AVCodecContext *avctx;
     int apt, is16_9;
-    int size = 0;
 
-    if (c->sys) {
         avctx = c->vst->codec;
 
         avpriv_set_pts_info(c->vst, 64, c->sys->time_base.num,
@@ -302,9 +300,7 @@ static int dv_extract_video_info(DVDemuxContext *c, const uint8_t *frame)
         avctx->bit_rate = av_rescale_q(c->sys->frame_size,
                                        (AVRational) { 8, 1 },
                                        c->sys->time_base);
-        size = c->sys->frame_size;
-    }
-    return size;
+    return c->sys->frame_size;
 }
 
 static int dv_extract_timecode(DVDemuxContext* c, const uint8_t* frame, char *tc)