highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mov: Simplify get_stream_info_time()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-12-07 21:38:25 +01:00
parent 68e011e410
commit 21f4b456f1
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/mov.c
View File

@ -1234,16 +1234,12 @@ static int search_frag_moof_offset(MOVFragmentIndex *frag_index, int64_t offset)
static int64_t get_stream_info_time(MOVFragmentStreamInfo * frag_stream_info) static int64_t get_stream_info_time(MOVFragmentStreamInfo * frag_stream_info)
{ {
av_assert0(frag_stream_info);
if (frag_stream_info) { if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE)
if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE) return frag_stream_info->sidx_pts;
return frag_stream_info->sidx_pts; if (frag_stream_info->first_tfra_pts != AV_NOPTS_VALUE)
if (frag_stream_info->first_tfra_pts != AV_NOPTS_VALUE) return frag_stream_info->first_tfra_pts;
return frag_stream_info->first_tfra_pts; return frag_stream_info->tfdt_dts;
if (frag_stream_info->tfdt_dts != AV_NOPTS_VALUE)
return frag_stream_info->tfdt_dts;
}
return AV_NOPTS_VALUE;
} }
static int64_t get_frag_time(MOVFragmentIndex *frag_index, static int64_t get_frag_time(MOVFragmentIndex *frag_index,