diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 02:41:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 02:41:44 +0200 |
| commit | cb53db144c104f447782b8918e94704484aedc8b (patch) | |
| tree | 90005c2b6a3b02e89a2eb3c04ec0a986b0929f57 /libavformat/mp3dec.c | |
| parent | bf1fd59c6a22854ddc601f3125ff55ba5f82ad24 (diff) | |
| download | ffmpeg-streaming-cb53db144c104f447782b8918e94704484aedc8b.zip ffmpeg-streaming-cb53db144c104f447782b8918e94704484aedc8b.tar.gz | |
avformat/mp3dec: Rename sync() function to avoid build failure on android
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mp3dec.c')
| -rw-r--r-- | libavformat/mp3dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 266f17c..007c6ea 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; |
