generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename sync() functions in libavformat.

Browse Source 
Fixes compilation on Android where the sync() definition in
unistd.h interferes with the static definitions in libavformat.
This commit is contained in:
Carl Eugen Hoyos 2014-11-25 23:49:58 +01:00
parent 1907ff0a67
commit 5badcdf20d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/lxfdec.c
View File

@ -83,7 +83,7 @@ static int check_checksum(const uint8_t *header, int size)
* @param[out] header where to copy the ident to * @param[out] header where to copy the ident to
* @return 0 if an ident was found, < 0 on I/O error * @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]; uint8_t buf[LXF_IDENT_LENGTH];
int ret; int ret;
@ -120,7 +120,7 @@ static int get_packet_header(AVFormatContext *s)
const uint8_t *p = header + LXF_IDENT_LENGTH; const uint8_t *p = header + LXF_IDENT_LENGTH;
//find and read the ident //find and read the ident
if ((ret = sync(s, header)) < 0) if ((ret = lxf_sync(s, header)) < 0)
return ret; return ret;
ret = avio_read(pb, header + LXF_IDENT_LENGTH, 8); ret = avio_read(pb, header + LXF_IDENT_LENGTH, 8);

6
libavformat/rmdec.c
View File

@ -610,7 +610,7 @@ static int get_num(AVIOContext *pb, int *len)
/* multiple of 20 bytes for ra144 (ugly) */ /* multiple of 20 bytes for ra144 (ugly) */
#define RAW_PACKET_SIZE 1000 #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; RMDemuxContext *rm = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st; AVStream *st;
@ -964,7 +964,7 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
flags = (seq++ == 1) ? 2 : 0; flags = (seq++ == 1) ? 2 : 0;
pos = avio_tell(s->pb); pos = avio_tell(s->pb);
} else { } else {
len=sync(s, &timestamp, &flags, &i, &pos); len = rm_sync(s, &timestamp, &flags, &i, &pos);
if (len > 0) if (len > 0)
st = s->streams[i]; st = s->streams[i];
} }
@ -1035,7 +1035,7 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index,
int seq=1; int seq=1;
AVStream *st; AVStream *st;
len=sync(s, &dts, &flags, &stream_index2, &pos); len = rm_sync(s, &dts, &flags, &stream_index2, &pos);
if(len<0) if(len<0)
return AV_NOPTS_VALUE; return AV_NOPTS_VALUE;