Merge commit '11e05533170485b593974cf90916425a0188e7bd'

[ffmpeg] / libavcodec / h264_parser.c

diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 24d87d0709168459939276b51e1a11495effac4a..b1815e6d4587e32d6feea61e2808d2ca4fbd2ef3 100644 (file)
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -557,7 +557,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;
@@ -582,6 +582,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,
 };