[FFmpeg-cvslog] avformat/dv: fix used dimension variables
Michael Niedermayer
git at videolan.org
Thu Mar 26 05:09:34 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 26 03:10:27 2015 +0100| [2139e584391b6db7ad315cf4f6443f87f7813d51] | committer: Michael Niedermayer
avformat/dv: fix used dimension variables
Fixes null pointer dereference during seeking
Fixes Ticket4395
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2139e584391b6db7ad315cf4f6443f87f7813d51
---
libavformat/dv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 485a5f8..8500228 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -422,8 +422,8 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c,
int64_t timestamp, int flags)
{
// FIXME: sys may be wrong if last dv_read_packet() failed (buffer is junk)
- const AVDVProfile *sys = av_dv_codec_profile2(c->vst->codec->width, c->vst->codec->height,
- c->vst->codec->pix_fmt, c->vst->codec->time_base);
+ const AVDVProfile *sys = av_dv_codec_profile2(c->vst->codec->coded_width, c->vst->codec->coded_height,
+ c->vst->codec->pix_fmt, c->vst->codec->time_base);
int64_t offset;
int64_t size = avio_size(s->pb) - s->internal->data_offset;
int64_t max_offset = ((size - 1) / sys->frame_size) * sys->frame_size;
More information about the ffmpeg-cvslog
mailing list