On Sat, Oct 31, 2015 at 12:54 PM, Luca Barbato <lu_z...@gentoo.org> wrote:
> On 31/10/15 17:23, Diego Biurrun wrote:
>> At least on AIX it conflicts with the close() libc function from unistd.h.
>> ---
>> This should hopefully fix a bunch of failing FATE instances.
>>
>> 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,
>> };
>>
>
> +2: Ok.
Feel free to kick me out for this, but this commit (barring the
message) is identical to ccaa5dcb31353fba43245ea737f42b7f2099973d of
FFmpeg.
Unless discovered independently, please adjust the tags accordingly.
>
> lu
> _______________________________________________
> libav-devel mailing list
> libav-devel@libav.org
> https://lists.libav.org/mailman/listinfo/libav-devel
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
