[FFmpeg-cvslog] avcodec/h264_parser: Rename close()

Michael Niedermayer git at videolan.org
Wed Jan 28 13:53:47 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 28 13:09:30 2015 +0100| [ccaa5dcb31353fba43245ea737f42b7f2099973d] | committer: Michael Niedermayer

avcodec/h264_parser: Rename close()

This avoids a potential conflict with the equally named function for closing files
It also could reduce confusion in debugger backtraces

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

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

 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 24d87d0..b1815e6 100644
--- 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,
 };



More information about the ffmpeg-cvslog mailing list