summaryrefslogtreecommitdiff
path: root/libavcodec/pngdec.c
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2014-11-14 10:17:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-14 15:35:12 +0100
commit98abb98cb1c7e83322d70b7e3a3f20a2479c6e9b (patch)
tree291cf5d8218d23cd45cdf0e445db5561e3552339 /libavcodec/pngdec.c
parentb186b7131e160d7e3ea8ef4c52745b56ddcb287b (diff)
avcodec/pngdec: rename decode_frame to decode_frame_png
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngdec.c')
-rw-r--r--libavcodec/pngdec.c4
1 files 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*/,