repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
lxfdec.c
diff --git
a/ffmpeg/libavformat/lxfdec.c
b/ffmpeg/libavformat/lxfdec.c
index 11d6da5cc90ff64e552fc117300bdc37b91da814..fb37da7827e34892745b7a89bebe661df11eefc4 100644
(file)
--- a/
ffmpeg/libavformat/lxfdec.c
+++ b/
ffmpeg/libavformat/lxfdec.c
@@
-83,7
+83,7
@@
static int check_checksum(const uint8_t *header, int size)
* @param[out] header where to copy the ident to
* @return 0 if an ident was found, < 0 on I/O error
*/
* @param[out] header where to copy the ident to
* @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];
int ret;
{
uint8_t buf[LXF_IDENT_LENGTH];
int ret;
@@
-120,7
+120,7
@@
static int get_packet_header(AVFormatContext *s)
const uint8_t *p = header + LXF_IDENT_LENGTH;
//find and read the ident
const uint8_t *p = header + LXF_IDENT_LENGTH;
//find and read the ident
- if ((ret = sync(s, header)) < 0)
+ if ((ret =
lxf_
sync(s, header)) < 0)
return ret;
ret = avio_read(pb, header + LXF_IDENT_LENGTH, 8);
return ret;
ret = avio_read(pb, header + LXF_IDENT_LENGTH, 8);