diff options
author | Diego Biurrun <diego@biurrun.de> | 2015-10-31 17:21:25 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2015-11-01 14:52:01 +0100 |
commit | 8161220eee152dad8b2ea9e2755c78c8e127f747 (patch) | |
tree | 82add9b7dfe169359205dd5638d9431087fffb97 /libavcodec | |
parent | 407ac22322e5ce67996ec54ef619cafa4c9ceb78 (diff) | |
download | ffmpeg-8161220eee152dad8b2ea9e2755c78c8e127f747.tar.gz |
h264_parser: Rename close() to h264_close()
At least on AIX it conflicts with the close() libc function from unistd.h.
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/h264_parser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index f44435532e..eadce69d7d 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, }; |