diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavformat/cafdec.c')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavformat/cafdec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chromium/third_party/ffmpeg/libavformat/cafdec.c b/chromium/third_party/ffmpeg/libavformat/cafdec.c index e954c65683b..a8edbca039b 100644 --- a/chromium/third_party/ffmpeg/libavformat/cafdec.c +++ b/chromium/third_party/ffmpeg/libavformat/cafdec.c @@ -25,6 +25,8 @@ * Core Audio Format demuxer */ +#include <inttypes.h> + #include "avformat.h" #include "internal.h" #include "isom.h" @@ -154,9 +156,8 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) avio_skip(pb, size - ALAC_NEW_KUKI); } } else { - if (ff_alloc_extradata(st->codec, size)) + if (ff_get_extradata(st->codec, pb, size) < 0) return AVERROR(ENOMEM); - avio_read(pb, st->codec->extradata, size); } return 0; @@ -286,7 +287,8 @@ static int read_header(AVFormatContext *s) default: #define _(x) ((x) >= ' ' ? (x) : ' ') - av_log(s, AV_LOG_WARNING, "skipping CAF chunk: %08X (%c%c%c%c), size %"PRId64"\n", + av_log(s, AV_LOG_WARNING, + "skipping CAF chunk: %08"PRIX32" (%c%c%c%c), size %"PRId64"\n", tag, _(tag>>24), _((tag>>16)&0xFF), _((tag>>8)&0xFF), _(tag&0xFF), size); #undef _ case MKBETAG('f','r','e','e'): |