Re: [FFmpeg-devel] [PATCH 2/2] avformat/mov: pass the demuxer's AVFormatContext to avpriv_request_sample()

2016-10-18 Thread James Almer 
On 10/17/2016 6:42 PM, Michael Niedermayer wrote:
> On Sun, Oct 16, 2016 at 09:34:51PM -0300, James Almer wrote:
>> Signed-off-by: James Almer 
>> ---
>>  libavformat/mov.c | 7 ---
>>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> LGTM
> 
> thx

Pushed, thanks.

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 2/2] avformat/mov: pass the demuxer's AVFormatContext to avpriv_request_sample()

2016-10-17 Thread Michael Niedermayer 
On Sun, Oct 16, 2016 at 09:34:51PM -0300, James Almer wrote:
> Signed-off-by: James Almer 
> ---
>  libavformat/mov.c | 7 ---
>  1 file changed, 4 insertions(+), 3 deletions(-)

LGTM

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

It is dangerous to be right in matters on which the established authorities
are wrong. -- Voltaire


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 2/2] avformat/mov: pass the demuxer's AVFormatContext to avpriv_request_sample()

2016-10-16 Thread James Almer 
Signed-off-by: James Almer 
---
 libavformat/mov.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7462ecf..5189706 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, _list_media_time,
+while (get_edit_list_entry(mov, msc, edit_list_index, 
_list_media_time,
_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);
-- 
2.9.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel