[FFmpeg-devel] [PATCH 1/2] lavf/utils: simplify matching MOV-like formats

[Clément Bœsch]

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 at 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

-- 
Clément B.