diff options
| author | Vesselin Bontchev <vesselin.bontchev@yandex.com> | 2015-07-31 12:16:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-02 03:40:38 +0200 |
| commit | 336822edf4fc0bb7d29570a2b611e2137daa9430 (patch) | |
| tree | 5e832d7a03dc6a3cd81b67e25f1be66538f3700c /libavformat/mov.c | |
| parent | 5bf8590d6e76c57676611036c4dd9ddbcaec0cce (diff) | |
| download | ffmpeg-336822edf4fc0bb7d29570a2b611e2137daa9430.tar.gz | |
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>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index fdba34cf4a..154d2f83f5 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) { |