forked from FFmpeg/FFmpeg
use bytestream_get_* in vorbis_comment()
Originally committed as revision 10724 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
80b1c5a858
commit
0a770ae7b4
1 changed files with 3 additions and 6 deletions
|
@ -39,8 +39,7 @@ vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
|
||||||
if (size < 8) /* must have vendor_length and user_comment_list_length */
|
if (size < 8) /* must have vendor_length and user_comment_list_length */
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
s = AV_RL32(p);
|
s = bytestream_get_le32(&p);
|
||||||
p += 4;
|
|
||||||
size -= 4;
|
size -= 4;
|
||||||
|
|
||||||
if (size - 4 < s)
|
if (size - 4 < s)
|
||||||
|
@ -49,16 +48,14 @@ vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
|
||||||
p += s;
|
p += s;
|
||||||
size -= s;
|
size -= s;
|
||||||
|
|
||||||
n = AV_RL32(p);
|
n = bytestream_get_le32(&p);
|
||||||
p += 4;
|
|
||||||
size -= 4;
|
size -= 4;
|
||||||
|
|
||||||
while (size >= 4) {
|
while (size >= 4) {
|
||||||
char *t, *v;
|
char *t, *v;
|
||||||
int tl, vl;
|
int tl, vl;
|
||||||
|
|
||||||
s = AV_RL32(p);
|
s = bytestream_get_le32(&p);
|
||||||
p += 4;
|
|
||||||
size -= 4;
|
size -= 4;
|
||||||
|
|
||||||
if (size < s)
|
if (size < s)
|
||||||
|
|
Loading…
Add table
Reference in a new issue