| Message ID | 20160913085126.10977-2-u@pkh.me |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Sep 13, 2016 at 10:51:25AM +0200, Clément Bœsch wrote: > From: Clément Bœsch <clement@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")) { forgot to add 3gp, which means the next commit is all about adding ismv
On Tue, Sep 13, 2016 at 11:00:27AM +0200, Clément Bœsch wrote: > On Tue, Sep 13, 2016 at 10:51:25AM +0200, Clément Bœsch wrote: > > From: Clément Bœsch <clement@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")) { > > forgot to add 3gp, which means the next commit is all about adding ismv LGTM without missing parts [...]
On Tue, Sep 13, 2016 at 01:06:17PM +0200, Michael Niedermayer wrote: > On Tue, Sep 13, 2016 at 11:00:27AM +0200, Clément Bœsch wrote: > > On Tue, Sep 13, 2016 at 10:51:25AM +0200, Clément Bœsch wrote: > > > From: Clément Bœsch <clement@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")) { > > > > forgot to add 3gp, which means the next commit is all about adding ismv > > LGTM without missing parts > done and pushed
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
From: Clément Bœsch <clement@stupeflix.com> --- libavformat/utils.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)