From 0a770ae7b49547ca3e15ea74de9bdba0ec05ed5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Sat, 13 Oct 2007 11:42:06 +0000
Subject: [PATCH] use bytestream_get_* in vorbis_comment()
Originally committed as revision 10724 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/oggparsevorbis.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 4cbf8fe4222..a89e881581f 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -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 */
return -1;
- s = AV_RL32(p);
- p += 4;
+ s = bytestream_get_le32(&p);
size -= 4;
if (size - 4 < s)
@@ -49,16 +48,14 @@ vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
p += s;
size -= s;
- n = AV_RL32(p);
- p += 4;
+ n = bytestream_get_le32(&p);
size -= 4;
while (size >= 4) {
char *t, *v;
int tl, vl;
- s = AV_RL32(p);
- p += 4;
+ s = bytestream_get_le32(&p);
size -= 4;
if (size < s)
--
GitLab