From cb53db144c104f447782b8918e94704484aedc8b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 20 Jul 2015 02:41:44 +0200 Subject: avformat/mp3dec: Rename sync() function to avoid build failure on android Signed-off-by: Michael Niedermayer --- libavformat/mp3dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/mp3dec.c') diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 266f17cac7..007c6eaf8b 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -437,7 +437,7 @@ static int check(AVIOContext *pb, int64_t pos) return sd.frame_size; } -static int64_t sync(AVFormatContext *s, int64_t target_pos, int flags) +static int64_t mp3_sync(AVFormatContext *s, int64_t target_pos, int flags) { int dir = (flags&AVSEEK_FLAG_BACKWARD) ? -1 : 1; int64_t best_pos; @@ -511,7 +511,7 @@ static int mp3_seek(AVFormatContext *s, int stream_index, int64_t timestamp, return -1; } - best_pos = sync(s, ie->pos, flags); + best_pos = mp3_sync(s, ie->pos, flags); if (best_pos < 0) return best_pos; -- cgit v1.2.3