On Fri, Jul 31, 2015 at 01:36:58PM +0300, Vesselin Bontchev wrote: > mov.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > 3ce53f8e77ea37ccba5bbee3c18648b169804cf3 > 0001-avformat-mov-fix-regression-in-processing-.aax-files.patch > From 418d573659dd011de503e45622307974cf437df5 Mon Sep 17 00:00:00 2001 > From: Vesselin Bontchev <vesselin.bontc...@yandex.com> > Date: Fri, 31 Jul 2015 12:16:08 +0200 > Subject: [PATCH] avformat/mov: fix regression in processing .aax files > > Commit 0a551cbe introduced "activation_bytes" option, and not specifying > this option (while calling ffmpeg / ffprobe) causes the program to quit > early. Before this commit, ffprobe was capable of processing metadata in > .aax files. > --- > libavformat/mov.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/libavformat/mov.c b/libavformat/mov.c > index fdba34c..6a81848 100644 > --- a/libavformat/mov.c > +++ b/libavformat/mov.c > @@ -849,13 +849,13 @@ static int mov_read_adrm(MOVContext *c, AVIOContext > *pb, MOVAtom atom) > > /* verify activation data */ > if (!activation_bytes || c->activation_bytes_size != 4) {
not part of this patch but both check for c->activation_bytes_size != 4 is this intended? isnt the 2nd unreachable that way ? > - av_log(c->fc, AV_LOG_FATAL, "[aax] activation_bytes option is > missing!\n"); > - ret = AVERROR(EINVAL); > + av_log(c->fc, AV_LOG_WARNING, "[aax] activation_bytes option is > missing!\n"); > + ret = 0; /* allow ffprobe to continue working on .aax files */ > goto fail; > } > if (c->activation_bytes_size != 4) { > - av_log(c->fc, AV_LOG_FATAL, "[aax] activation_bytes value needs to > be 4 bytes!\n"); > - ret = AVERROR(EINVAL); > + av_log(c->fc, AV_LOG_WARNING, "[aax] activation_bytes value needs to > be 4 bytes!\n"); > + ret = 0; /* allow ffprobe to continue working on .aax files */ > goto fail; > } are both needed for ffprobe ? wouldnt ffprobe simply have it not set and take the first if() always [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The educated differ from the uneducated as much as the living from the dead. -- Aristotle
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel