From 98abb98cb1c7e83322d70b7e3a3f20a2479c6e9b Mon Sep 17 00:00:00 2001 From: Benoit Fouet Date: Fri, 14 Nov 2014 10:17:30 +0100 Subject: [PATCH] avcodec/pngdec: rename decode_frame to decode_frame_png Signed-off-by: Michael Niedermayer --- libavcodec/pngdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 835d962180..abb8029321 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -519,7 +519,7 @@ static int decode_text_chunk(PNGDecContext *s, uint32_t length, int compressed, return 0; } -static int decode_frame(AVCodecContext *avctx, +static int decode_frame_png(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { @@ -952,7 +952,7 @@ AVCodec ff_png_decoder = { .priv_data_size = sizeof(PNGDecContext), .init = png_dec_init, .close = png_dec_end, - .decode = decode_frame, + .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*/,