ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Fri Dec 7 21:38:25 2018 +0100| [21f4b456f1ffeaaaa2c4e8ee940f41a569ae6979] | committer: Michael Niedermayer
avformat/mov: Simplify get_stream_info_time() Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21f4b456f1ffeaaaa2c4e8ee940f41a569ae6979 --- libavformat/mov.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index fb95fd2fef..ec839ed5e3 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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) { - - if (frag_stream_info) { - if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE) - return frag_stream_info->sidx_pts; - if (frag_stream_info->first_tfra_pts != AV_NOPTS_VALUE) - return frag_stream_info->first_tfra_pts; - if (frag_stream_info->tfdt_dts != AV_NOPTS_VALUE) - return frag_stream_info->tfdt_dts; - } - return AV_NOPTS_VALUE; + av_assert0(frag_stream_info); + if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE) + return frag_stream_info->sidx_pts; + if (frag_stream_info->first_tfra_pts != AV_NOPTS_VALUE) + return frag_stream_info->first_tfra_pts; + return frag_stream_info->tfdt_dts; } static int64_t get_frag_time(MOVFragmentIndex *frag_index, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
