[FFmpeg-cvslog] avformat/mov: fix regression in processing .aax files
Vesselin Bontchev
git at videolan.org
Sun Aug 2 03:48:34 CEST 2015
ffmpeg | branch: master | Vesselin Bontchev <vesselin.bontchev at yandex.com> | Fri Jul 31 12:16:08 2015 +0200| [336822edf4fc0bb7d29570a2b611e2137daa9430] | committer: Michael Niedermayer
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.
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=336822edf4fc0bb7d29570a2b611e2137daa9430
---
libavformat/mov.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index fdba34c..154d2f8 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -848,9 +848,9 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_log(c->fc, AV_LOG_INFO, "\n");
/* verify activation data */
- if (!activation_bytes || c->activation_bytes_size != 4) {
- av_log(c->fc, AV_LOG_FATAL, "[aax] activation_bytes option is missing!\n");
- ret = AVERROR(EINVAL);
+ if (!activation_bytes) {
+ 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) {
More information about the ffmpeg-cvslog
mailing list