diff mbox

[FFmpeg-devel,2/2] lavf/utils: sync MOV-like formats with the muxers found in lavf/movenc

Message ID 20160913085126.10977-3-u@pkh.me
State Accepted
Headers show

Commit Message

Clément Bœsch Sept. 13, 2016, 8:51 a.m. UTC 
From: Clément Bœsch <clement@stupeflix.com>

---
 libavformat/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer Sept. 13, 2016, 4:43 p.m. UTC | #1 
On Tue, Sep 13, 2016 at 10:51:26AM +0200, Clément Bœsch wrote:
> From: Clément Bœsch <clement@stupeflix.com>
> 
> ---
>  libavformat/utils.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/utils.c b/libavformat/utils.c
> index acb781e..35f13c1 100644
> --- a/libavformat/utils.c
> +++ b/libavformat/utils.c
> @@ -5315,7 +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)
> -               && !av_match_name(ofmt->name, "mov,mp4,3g2,psp,ipod,f4v")) {
> +               && !av_match_name(ofmt->name, "mov,3gp,mp4,psp,3g2,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

LGTM

thx

[...]
Clément Bœsch Sept. 14, 2016, 8:05 a.m. UTC | #2 
On Tue, Sep 13, 2016 at 06:43:17PM +0200, Michael Niedermayer wrote:
> On Tue, Sep 13, 2016 at 10:51:26AM +0200, Clément Bœsch wrote:
> > From: Clément Bœsch <clement@stupeflix.com>
> > 
> > ---
> >  libavformat/utils.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/libavformat/utils.c b/libavformat/utils.c
> > index acb781e..35f13c1 100644
> > --- a/libavformat/utils.c
> > +++ b/libavformat/utils.c
> > @@ -5315,7 +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)
> > -               && !av_match_name(ofmt->name, "mov,mp4,3g2,psp,ipod,f4v")) {
> > +               && !av_match_name(ofmt->name, "mov,3gp,mp4,psp,3g2,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
> 
> LGTM
> 
> thx
> 

applied
diff mbox

Patch

diff --git a/libavformat/utils.c b/libavformat/utils.c
index acb781e..35f13c1 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -5315,7 +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)
-               && !av_match_name(ofmt->name, "mov,mp4,3g2,psp,ipod,f4v")) {
+               && !av_match_name(ofmt->name, "mov,3gp,mp4,psp,3g2,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