diff options
| author | James Almer <jamrial@gmail.com> | 2016-10-16 21:23:17 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-10-18 23:09:02 -0300 |
| commit | ea201ad14cdeee778584ba066a82c500eca08836 (patch) | |
| tree | 445a88a38a6ddafe71a21d9fa73d000858e5264e | |
| parent | f45d5e07ddbdb1458cad8c42a3ed434cea5f148b (diff) | |
avformat/mov: pass the demuxer's AVFormatContext to avpriv_request_sample()
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/mov.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index cd3e46ad3c..9b400905df 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2762,7 +2762,8 @@ static int mov_read_sbgp(MOVContext *c, AVIOContext *pb, MOVAtom atom) /** * Get ith edit list entry (media time, duration). */ -static int get_edit_list_entry(const MOVStreamContext *msc, +static int get_edit_list_entry(MOVContext *mov, + const MOVStreamContext *msc, unsigned int edit_list_index, int64_t *edit_list_media_time, int64_t *edit_list_duration, @@ -2776,7 +2777,7 @@ static int get_edit_list_entry(const MOVStreamContext *msc, /* duration is in global timescale units;convert to msc timescale */ if (global_timescale == 0) { - avpriv_request_sample(msc, "Support for mvhd.timescale = 0 with editlists"); + avpriv_request_sample(mov->fc, "Support for mvhd.timescale = 0 with editlists"); return 0; } *edit_list_duration = av_rescale(*edit_list_duration, msc->time_scale, @@ -2968,7 +2969,7 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) start_dts = edit_list_dts_entry_end; - while (get_edit_list_entry(msc, edit_list_index, &edit_list_media_time, + while (get_edit_list_entry(mov, msc, edit_list_index, &edit_list_media_time, &edit_list_duration, mov->time_scale)) { av_log(mov->fc, AV_LOG_DEBUG, "Processing st: %d, edit list %"PRId64" - media time: %"PRId64", duration: %"PRId64"\n", st->index, edit_list_index, edit_list_media_time, edit_list_duration); |