diff options
| author | Thomas Hebb <tommyhebb@gmail.com> | 2016-08-28 12:24:55 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-28 20:54:22 +0200 |
| commit | a37e6dd2ba85a44fc283d24f3ee3bdd8abad5b9b (patch) | |
| tree | 141a4eb1d1d847435a720412f11d5772f0ea899f | |
| parent | cac2df230e730906bd1ec6cbd18670214fbf92bb (diff) | |
| download | ffmpeg-streaming-a37e6dd2ba85a44fc283d24f3ee3bdd8abad5b9b.zip ffmpeg-streaming-a37e6dd2ba85a44fc283d24f3ee3bdd8abad5b9b.tar.gz | |
avformat/mov: aax: pass proper AVClass to av_log()
av_log() expects its first parameter to be a pointer to a struct whose
first element is a pointer to an AVClass. In what I can only imagine is
a typo, one call to av_log() in the AAX decryption code instead passes
a pointer to an AVSHA struct, which doesn't even contain a pointer as
its first element, much less a pointer to an AVClass. Change the call to
pass the current MOVContext, as surrounding calls do.
The incorrect AVClass was causing mpv to emit the warning "av_log
callback called with bad parameters" when playing an .aax file.
Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 6282d8f..f499906 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -997,7 +997,7 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_INFO, "[aax] file checksum == "); // required by external tools for (i = 0; i < 20; i++) - av_log(sha, AV_LOG_INFO, "%02x", file_checksum[i]); + av_log(c->fc, AV_LOG_INFO, "%02x", file_checksum[i]); av_log(c->fc, AV_LOG_INFO, "\n"); /* verify activation data */ |
