[FFmpeg-cvslog] lavf/utils: simplify matching MOV-like formats

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Wed Sep 14 09:59:22 2016 +0200| [9112822e710983f7ebf3cef9efadd28d8714dd43] | committer: Clément Bœsch

lavf/utils: simplify matching MOV-like formats

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9112822e710983f7ebf3cef9efadd28d8714dd43
---

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index f4a836d..06c7582 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -5318,9 +5318,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,3gp,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