X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fpngdec.c;h=6e7eae04fc916e17dfa39d092bb0bb3d9ab2a423;hb=bd074bde02aa11b93958300f06be2a18b549091a;hp=cb1cebb2384ed54fde2874829bc1a42113274c9e;hpb=508c815d4db0a795444476a9e175b2e6d09bb35c;p=ffmpeg diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index cb1cebb2384..6e7eae04fc9 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1171,7 +1171,7 @@ static int decode_frame_png(AVCodecContext *avctx, sig = bytestream2_get_be64(&s->gb); if (sig != PNGSIG && sig != MNGSIG) { - av_log(avctx, AV_LOG_ERROR, "Invalid PNG signature (%d).\n", buf_size); + av_log(avctx, AV_LOG_ERROR, "Invalid PNG signature 0x%08"PRIX64".\n", sig); return AVERROR_INVALIDDATA; } @@ -1363,7 +1363,7 @@ AVCodec ff_apng_decoder = { .decode = decode_frame_apng, .init_thread_copy = ONLY_IF_THREADS_ENABLED(png_dec_init), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS /*| CODEC_CAP_DRAW_HORIZ_BAND*/, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, }; #endif @@ -1379,6 +1379,6 @@ AVCodec ff_png_decoder = { .decode = decode_frame_png, .init_thread_copy = ONLY_IF_THREADS_ENABLED(png_dec_init), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS /*| CODEC_CAP_DRAW_HORIZ_BAND*/, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, }; #endif