[SCM] libav/experimental: use AV_RL32

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:02:36 UTC 2013


The following commit has been merged in the experimental branch:
commit 1eb1f6fdb85cfe53a452f37c2dc636740637b5ae
Author: Måns Rullgård <mans at mansr.com>
Date:   Sun Jun 24 12:20:16 2007 +0000

    use AV_RL32
    
    Originally committed as revision 9409 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 0020c3f..b4d03bd 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -38,7 +38,7 @@ vorbis_comment (AVFormatContext * as, uint8_t *buf, int size)
     if (size < 4)
         return -1;
 
-    s = le2me_32 (unaligned32 (p));
+    s = AV_RL32(p);
     p += 4;
     size -= 4;
 
@@ -48,7 +48,7 @@ vorbis_comment (AVFormatContext * as, uint8_t *buf, int size)
     p += s;
     size -= s;
 
-    n = le2me_32 (unaligned32 (p));
+    n = AV_RL32(p);
     p += 4;
     size -= 4;
 
@@ -56,7 +56,7 @@ vorbis_comment (AVFormatContext * as, uint8_t *buf, int size)
         char *t, *v;
         int tl, vl;
 
-        s = le2me_32 (unaligned32 (p));
+        s = AV_RL32(p);
         p += 4;
         size -= 4;
 
@@ -185,9 +185,9 @@ vorbis_header (AVFormatContext * s, int idx)
     if (os->buf[os->pstart] == 1) {
         uint8_t *p = os->buf + os->pstart + 11; //skip up to the audio channels
         st->codec->channels = *p++;
-        st->codec->sample_rate = le2me_32 (unaligned32 (p));
+        st->codec->sample_rate = AV_RL32(p);
         p += 8; //skip maximum and and nominal bitrate
-        st->codec->bit_rate = le2me_32 (unaligned32 (p)); //Minimum bitrate
+        st->codec->bit_rate = AV_RL32(p); //Minimum bitrate
 
         st->codec->codec_type = CODEC_TYPE_AUDIO;
         st->codec->codec_id = CODEC_ID_VORBIS;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list