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 <clem...@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 [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Those who are best at talking, realize last or never when they are wrong.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel