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/rmdec.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/rmdec.c')
-rw-r--r-- | libavformat/rmdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 96b9e7f238..c46b53f335 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -610,7 +610,7 @@ static int get_num(AVIOContext *pb, int *len) /* multiple of 20 bytes for ra144 (ugly) */ #define RAW_PACKET_SIZE 1000 -static int sync(AVFormatContext *s, int64_t *timestamp, int *flags, int *stream_index, int64_t *pos){ +static int rm_sync(AVFormatContext *s, int64_t *timestamp, int *flags, int *stream_index, int64_t *pos){ RMDemuxContext *rm = s->priv_data; AVIOContext *pb = s->pb; AVStream *st; @@ -964,7 +964,7 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt) flags = (seq++ == 1) ? 2 : 0; pos = avio_tell(s->pb); } else { - len=sync(s, ×tamp, &flags, &i, &pos); + len = rm_sync(s, ×tamp, &flags, &i, &pos); if (len > 0) st = s->streams[i]; } @@ -1035,7 +1035,7 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index, int seq=1; AVStream *st; - len=sync(s, &dts, &flags, &stream_index2, &pos); + len = rm_sync(s, &dts, &flags, &stream_index2, &pos); if(len<0) return AV_NOPTS_VALUE; |