From 739587bf0419a860384bfb1ac0ad768634c1563f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Wed, 10 Oct 2007 22:59:34 +0000 Subject: use bytestream_get_* in vorbis_header() Originally committed as revision 10706 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/oggparsevorbis.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 8d09cbd..f134d6d 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -25,6 +25,7 @@ #include #include "avformat.h" #include "bitstream.h" +#include "bytestream.h" #include "bswap.h" #include "ogg2.h" #include "avstring.h" @@ -187,10 +188,10 @@ vorbis_header (AVFormatContext * s, int idx) if (os->psize != 30) return -1; - st->codec->channels = *p++; - st->codec->sample_rate = AV_RL32(p); - p += 8; //skip maximum and and nominal bitrate - st->codec->bit_rate = AV_RL32(p); //Minimum bitrate + st->codec->channels = bytestream_get_byte(&p); + st->codec->sample_rate = bytestream_get_le32(&p); + p += 4; // skip maximum bitrate + st->codec->bit_rate = bytestream_get_le32(&p); // nominal bitrate st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_VORBIS; -- cgit v1.1