[FFmpeg-cvslog] lavf/dv: do not check for c->sys
Clément Bœsch
git at videolan.org
Sun Mar 20 19:29:50 CET 2016
ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 20 14:24:53 2016 +0100| [35ba5c424bbecea632c7cce0c9cae51190478068] | committer: Clément Bœsch
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.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35ba5c424bbecea632c7cce0c9cae51190478068
---
libavformat/dv.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 84c3061..b1f8759 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)
More information about the ffmpeg-cvslog
mailing list