Mercurial > libavformat.hg

comparison oggparsevorbis.c @ 729:9372cd60d25d libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
s/u_char/uint8_t/
author mru
date Sun, 10 Apr 2005 18:03:06 +0000
parents 17178af951b4
children c72bba158baa
comparison
equal deleted inserted replaced
728:db6846a618bd 729:9372cd60d25d
131 { 131 {
132 ogg_t *ogg = s->priv_data; 132 ogg_t *ogg = s->priv_data;
133 ogg_stream_t *os = ogg->streams + idx; 133 ogg_stream_t *os = ogg->streams + idx;
134 AVStream *st = s->streams[idx]; 134 AVStream *st = s->streams[idx];
135 int cds = st->codec.extradata_size + os->psize + 2; 135 int cds = st->codec.extradata_size + os->psize + 2;
136 u_char *cdp; 136 uint8_t *cdp;
137 137
138 if (os->seq > 2) 138 if (os->seq > 2)
139 return 0; 139 return 0;
140 140
141 st->codec.extradata = av_realloc (st->codec.extradata, cds); 141 st->codec.extradata = av_realloc (st->codec.extradata, cds);
144 *cdp++ = os->psize & 0xff; 144 *cdp++ = os->psize & 0xff;
145 memcpy (cdp, os->buf + os->pstart, os->psize); 145 memcpy (cdp, os->buf + os->pstart, os->psize);
146 st->codec.extradata_size = cds; 146 st->codec.extradata_size = cds;
147 147
148 if (os->buf[os->pstart] == 1) { 148 if (os->buf[os->pstart] == 1) {
149 u_char *p = os->buf + os->pstart + 11; //skip up to the audio channels 149 uint8_t *p = os->buf + os->pstart + 11; //skip up to the audio channels
150 st->codec.channels = *p++; 150 st->codec.channels = *p++;
151 st->codec.sample_rate = le2me_32 (unaligned32 (p)); 151 st->codec.sample_rate = le2me_32 (unaligned32 (p));
152 p += 8; //skip maximum and and nominal bitrate 152 p += 8; //skip maximum and and nominal bitrate
153 st->codec.bit_rate = le2me_32 (unaligned32 (p)); //Minimum bitrate 153 st->codec.bit_rate = le2me_32 (unaligned32 (p)); //Minimum bitrate
154 154