From 5badcdf20d98b7edede3d7701d31dba58822a99a Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 25 Nov 2014 23:49:58 +0100 Subject: Rename sync() functions in libavformat. Fixes compilation on Android where the sync() definition in unistd.h interferes with the static definitions in libavformat. --- libavformat/lxfdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/lxfdec.c') diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c index 11d6da5cc9..fb37da7827 100644 --- a/libavformat/lxfdec.c +++ b/libavformat/lxfdec.c @@ -83,7 +83,7 @@ static int check_checksum(const uint8_t *header, int size) * @param[out] header where to copy the ident to * @return 0 if an ident was found, < 0 on I/O error */ -static int sync(AVFormatContext *s, uint8_t *header) +static int lxf_sync(AVFormatContext *s, uint8_t *header) { uint8_t buf[LXF_IDENT_LENGTH]; int ret; @@ -120,7 +120,7 @@ static int get_packet_header(AVFormatContext *s) const uint8_t *p = header + LXF_IDENT_LENGTH; //find and read the ident - if ((ret = sync(s, header)) < 0) + if ((ret = lxf_sync(s, header)) < 0) return ret; ret = avio_read(pb, header + LXF_IDENT_LENGTH, 8); -- cgit v1.2.3