Browse Source

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@niedermayer.cc>
tags/n2.8
Vesselin Bontchev Michael Niedermayer 10 years ago
parent
commit
336822edf4
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      libavformat/mov.c

+ 3
- 3
libavformat/mov.c View File

@@ -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) {


Loading…
Cancel
Save