Mercurial > libavformat.hg

changeset 2596:9e91148f1d44 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use bytestream_get_* in vorbis_header()
author mru
date Wed, 10 Oct 2007 22:59:34 +0000
parents f9cfd91f344a
children eb7808a9d361
files oggparsevorbis.c
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/oggparsevorbis.c	Wed Oct 10 22:59:31 2007 +0000
+++ b/oggparsevorbis.c	Wed Oct 10 22:59:34 2007 +0000
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include "avformat.h"
 #include "bitstream.h"
+#include "bytestream.h"
 #include "bswap.h"
 #include "ogg2.h"
 #include "avstring.h"
@@ -187,10 +188,10 @@
         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;