virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

lavf/dv: use c->sys->frame_size in dv_frame_offset()

Browse Source 
dv_frame_offset() is static and called only from dv_read_seek(), where
c->sys->frame_size is already used.

This simplifies the incoming codecpar merge where
avctx->{coded_width,coded_height,time_base} are not accessible anymore.
This commit is contained in:
Clément Bœsch 2016-03-20 16:14:22 +01:00
parent 6c0cf11f38
commit 8284a4ba11
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/dv.c
View File

@ -418,13 +418,12 @@ 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->coded_width, c->vst->codec->coded_height,
c->vst->codec->pix_fmt, c->vst->codec->time_base);
const int frame_size = c->sys->frame_size;
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;
int64_t max_offset = ((size - 1) / frame_size) * frame_size;
offset = sys->frame_size * timestamp;
offset = frame_size * timestamp;
if (size >= 0 && offset > max_offset)
offset = max_offset;