RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-13 02:41:37 +00:00
Code Issues Projects Releases Wiki Activity

avformat/mp3dec: Rename sync() function to avoid build failure on android

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-20 02:41:44 +02:00
parent bf1fd59c6a
commit cb53db144c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mp3dec.c
View File

@ -437,7 +437,7 @@ static int check(AVIOContext *pb, int64_t pos)
return sd.frame_size; 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; int dir = (flags&AVSEEK_FLAG_BACKWARD) ? -1 : 1;
int64_t best_pos; int64_t best_pos;
@ -511,7 +511,7 @@ static int mp3_seek(AVFormatContext *s, int stream_index, int64_t timestamp,
return -1; return -1;
} }
best_pos = sync(s, ie->pos, flags); best_pos = mp3_sync(s, ie->pos, flags);
if (best_pos < 0) if (best_pos < 0)
return best_pos; return best_pos;