X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Flibvpxdec.c;h=3e320446f8fcf718d4c0f53010c35d4db378a85c;hb=b2bbcede5e44e4c71d761ac28f3a5c1e653c3cb6;hp=1ae2361167f9dcaf16d9544e64572fe03ad51435;hpb=c54268ce02f71c144d444a5e6d35417d5f043ed5;p=ffmpeg diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 1ae2361167f..3e320446f8f 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -32,6 +32,7 @@ #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" +#include "decode.h" #include "internal.h" #include "libvpx.h" #include "profiles.h" @@ -220,7 +221,7 @@ static int vpx_decode(AVCodecContext *avctx, struct vpx_image *img, *img_alpha; int ret; uint8_t *side_data = NULL; - int side_data_size = 0; + int side_data_size; ret = decode_frame(avctx, &ctx->decoder, avpkt->data, avpkt->size); if (ret) @@ -288,7 +289,7 @@ static int vpx_decode(AVCodecContext *avctx, img->d_h != img_alpha->d_h || img->bit_depth != img_alpha->bit_depth)) { av_log(avctx, AV_LOG_ERROR, - "Video dimensions %dx%d@%dbpp differ from alpha dimensions %dx%d@%dbpp\n", + "Video dimensions %dx%d@%dbpc differ from alpha dimensions %dx%d@%dbpc\n", img->d_w, img->d_h, img->bit_depth, img_alpha->d_w, img_alpha->d_h, img_alpha->bit_depth); return AVERROR_INVALIDDATA;