[FFmpeg-cvslog] avcodec/pngdec: rename decode_frame to decode_frame_png

Benoit Fouet git at videolan.org
Fri Nov 14 15:48:34 CET 2014


ffmpeg | branch: master | Benoit Fouet <benoit.fouet at free.fr> | Fri Nov 14 10:17:30 2014 +0100| [98abb98cb1c7e83322d70b7e3a3f20a2479c6e9b] | committer: Michael Niedermayer

avcodec/pngdec: rename decode_frame to decode_frame_png

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98abb98cb1c7e83322d70b7e3a3f20a2479c6e9b
---

 libavcodec/pngdec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 835d962..abb8029 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*/,



More information about the ffmpeg-cvslog mailing list