[FFmpeg-cvslog] h264_parser: Rename close() to h264_close()

Diego Biurrun git at videolan.org
Mon Nov 2 11:59:32 CET 2015


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Oct 31 17:21:25 2015 +0100| [8161220eee152dad8b2ea9e2755c78c8e127f747] | committer: Diego Biurrun

h264_parser: Rename close() to h264_close()

At least on AIX it conflicts with the close() libc function from unistd.h.

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

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

diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index f444355..eadce69 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -532,7 +532,7 @@ static int h264_split(AVCodecContext *avctx,
     return 0;
 }
 
-static void close(AVCodecParserContext *s)
+static void h264_close(AVCodecParserContext *s)
 {
     H264ParseContext *p = s->priv_data;
     H264Context      *h = &p->h;
@@ -562,6 +562,6 @@ AVCodecParser ff_h264_parser = {
     .priv_data_size = sizeof(H264ParseContext),
     .parser_init    = init,
     .parser_parse   = h264_parse,
-    .parser_close   = close,
+    .parser_close   = h264_close,
     .split          = h264_split,
 };



More information about the ffmpeg-cvslog mailing list