lineage-rockchip/android_external_ffmpeg
1
0
Fork 0
Code Activity Actions

Merge commit '42f9132218'

Browse source 
* commit '42f9132218':
  mxf: Do not use int to check the seek position

Conflicts:
	libavformat/mxfdec.c

See: 007989c7a2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-14 21:37:42 +01:00
commit 1171ad647e
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libavformat/mxfdec.c
View file

@ -2497,7 +2497,6 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
MXFContext* mxf = s->priv_data;
int64_t seekpos;
int i, ret;
int64_t ret64;
MXFIndexTable *t;
MXFTrack *source_track = st->priv_data;
@ -2512,8 +2511,10 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
sample_time = 0;
seconds = av_rescale(sample_time, st->time_base.num, st->time_base.den);
if ((ret64 = avio_seek(s->pb, (s->bit_rate * seconds) >> 3, SEEK_SET)) < 0)
return ret64;
seekpos = avio_seek(s->pb, (s->bit_rate * seconds) >> 3, SEEK_SET);
if (seekpos < 0)
return seekpos;
ff_update_cur_dts(s, st, sample_time);
mxf->current_edit_unit = sample_time;
} else {