[FFmpeg-devel] [PATCH 1/2] lavf/utils: simplify matching MOV-like formats

Clément Bœsch u at pkh.me
Tue Sep 13 11:51:25 EEST 2016


From: Clément Bœsch <clement at stupeflix.com>

---
 libavformat/utils.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 92a29ae..acb781e 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -5315,9 +5315,7 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt,
             enc_ctx->ticks_per_frame = 2;
         }
     } else if (!(ofmt->flags & AVFMT_VARIABLE_FPS)
-               && strcmp(ofmt->name, "mov") && strcmp(ofmt->name, "mp4") && strcmp(ofmt->name, "3gp")
-               && strcmp(ofmt->name, "3g2") && strcmp(ofmt->name, "psp") && strcmp(ofmt->name, "ipod")
-               && strcmp(ofmt->name, "f4v")) {
+               && !av_match_name(ofmt->name, "mov,mp4,3g2,psp,ipod,f4v")) {
         if (copy_tb == AVFMT_TBCF_AUTO && dec_ctx->time_base.den
             && av_q2d(dec_ctx->time_base)*dec_ctx->ticks_per_frame > av_q2d(ist->time_base)
             && av_q2d(ist->time_base) < 1.0/500
-- 
2.9.3



More information about the ffmpeg-devel mailing list