diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-11-25 23:49:58 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-11-25 23:49:58 +0100 |
| commit | 5badcdf20d98b7edede3d7701d31dba58822a99a (patch) | |
| tree | c28a924077e2764125e379551d6d099ef19e1f9d /libavformat/lxfdec.c | |
| parent | 1907ff0a67edeb98d9153aac79f35961837ba3f6 (diff) | |
Rename sync() functions in libavformat.
Fixes compilation on Android where the sync() definition in
unistd.h interferes with the static definitions in libavformat.
Diffstat (limited to 'libavformat/lxfdec.c')
| -rw-r--r-- | libavformat/lxfdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |