diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-09-14 09:59:22 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-09-14 09:59:22 +0200 |
| commit | 9112822e710983f7ebf3cef9efadd28d8714dd43 (patch) | |
| tree | 2f376284e7cdcf038df4dd149570b909b56ff89f | |
| parent | ae1dd0c9a61627169b9464ba56d3fea7ba19d4a1 (diff) | |
| download | ffmpeg-9112822e710983f7ebf3cef9efadd28d8714dd43.tar.gz | |
lavf/utils: simplify matching MOV-like formats
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index f4a836d80d..06c75826f8 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 |