aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2016-09-14 10:00:08 +0200
committerClément Bœsch <u@pkh.me>2016-09-14 10:00:08 +0200
commit415f907ce8dcca87c9e7cfdc954b92df399d3d80 (patch)
tree97427f049dbf85e4f9d6302cf9decdc7b99c1701 /libavformat
parent9112822e710983f7ebf3cef9efadd28d8714dd43 (diff)
downloadffmpeg-415f907ce8dcca87c9e7cfdc954b92df399d3d80.tar.gz
lavf/utils: add missing ismv in MOV-like formats
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 06c75826f8..cbaeef0d68 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -5318,7 +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)
- && !av_match_name(ofmt->name, "mov,mp4,3gp,3g2,psp,ipod,f4v")) {
+ && !av_match_name(ofmt->name, "mov,mp4,3gp,3g2,psp,ipod,ismv,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