diff options
author | Clément Bœsch <u@pkh.me> | 2016-03-20 14:24:53 +0100 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2016-03-20 14:25:16 +0100 |
commit | 35ba5c424bbecea632c7cce0c9cae51190478068 (patch) | |
tree | 15e0524c41c73e5ada2710ac332e91a76f677d06 /libavformat/dv.c | |
parent | 7916f04b89d4e970f17a14776b71b8c61c2b117d (diff) | |
download | ffmpeg-35ba5c424bbecea632c7cce0c9cae51190478068.tar.gz |
lavf/dv: do not check for c->sys
dv_extract_video_info() is a static function called only from
avpriv_dv_produce_packet(), where c->sys is made sure to be set.
Diffstat (limited to 'libavformat/dv.c')
-rw-r--r-- | libavformat/dv.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavformat/dv.c b/libavformat/dv.c index 84c306114b..b1f8759dbe 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -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) |