diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 21:37:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 21:37:42 +0100 |
| commit | 1171ad647ebfc03b65fd3a02720edb7f20c00169 (patch) | |
| tree | b4af34fb94f11372471c909bb1fc8cdf65998a8a | |
| parent | 8721dda1c57f6fd0f89c01bef89216ace1ec3377 (diff) | |
| parent | 42f9132218ca11a8e9a3c82a175b46bca092113e (diff) | |
| download | ffmpeg-1171ad647ebfc03b65fd3a02720edb7f20c00169.tar.gz | |
Merge commit '42f9132218ca11a8e9a3c82a175b46bca092113e'
* commit '42f9132218ca11a8e9a3c82a175b46bca092113e':
mxf: Do not use int to check the seek position
Conflicts:
libavformat/mxfdec.c
See: 007989c7a2215f54aeaf2393ab3aff0c208e862f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mxfdec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index c27c1fca2e..4af754ca33 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -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 { |