Originally committed as revision 11762 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Baptiste Coudurier 17 years ago
parent fbdad670e4
commit 47a0513b0c
  1. 8
      libavformat/oggparsevorbis.c

@ -33,8 +33,8 @@
extern int extern int
vorbis_comment(AVFormatContext * as, uint8_t *buf, int size) vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
{ {
uint8_t *p = buf; const uint8_t *p = buf;
uint8_t *end = buf + size; const uint8_t *end = buf + size;
unsigned s, n, j; unsigned s, n, j;
if (size < 8) /* must have vendor_length and user_comment_list_length */ if (size < 8) /* must have vendor_length and user_comment_list_length */
@ -50,7 +50,7 @@ vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
n = bytestream_get_le32(&p); n = bytestream_get_le32(&p);
while (p < end && n > 0) { while (p < end && n > 0) {
char *t, *v; const char *t, *v;
int tl, vl; int tl, vl;
s = bytestream_get_le32(&p); s = bytestream_get_le32(&p);
@ -176,7 +176,7 @@ vorbis_header (AVFormatContext * s, int idx)
priv->packet[os->seq] = av_mallocz(os->psize); priv->packet[os->seq] = av_mallocz(os->psize);
memcpy(priv->packet[os->seq], os->buf + os->pstart, os->psize); memcpy(priv->packet[os->seq], os->buf + os->pstart, os->psize);
if (os->buf[os->pstart] == 1) { if (os->buf[os->pstart] == 1) {
uint8_t *p = os->buf + os->pstart + 7; /* skip "\001vorbis" tag */ const uint8_t *p = os->buf + os->pstart + 7; /* skip "\001vorbis" tag */
unsigned blocksize, bs0, bs1; unsigned blocksize, bs0, bs1;
if (os->psize != 30) if (os->psize != 30)

Loading…
Cancel
Save