use get_bits_long() where needed

patch by Aurelien Jacobs, aurel gnuage org

Originally committed as revision 9314 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index 8960088..b2bdcd4 100644 (file)
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -49,7 +49,7 @@ flac_header (AVFormatContext * s, int idx)
         skip_bits(&gb, 4*8); /* "fLaC" */
 
         /* METADATA_BLOCK_HEADER */
-        if (get_bits(&gb, 32) != FLAC_STREAMINFO_SIZE)
+        if (get_bits_long(&gb, 32) != FLAC_STREAMINFO_SIZE)
             return -1;
 
         skip_bits(&gb, 16*2+24*2);

diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c
index c2045ce..b3dc4e4 100644 (file)
--- a/libavformat/oggparsetheora.c
+++ b/libavformat/oggparsetheora.c
@@ -86,12 +86,12 @@ theora_header (AVFormatContext * s, int idx)
 
         if (version >= 0x030200)
             skip_bits(&gb, 16);
-        st->codec->time_base.den = get_bits(&gb, 32);
-        st->codec->time_base.num = get_bits(&gb, 32);
+        st->codec->time_base.den = get_bits_long(&gb, 32);
+        st->codec->time_base.num = get_bits_long(&gb, 32);
         st->time_base = st->codec->time_base;
 
-        st->codec->sample_aspect_ratio.num = get_bits(&gb, 24);
-        st->codec->sample_aspect_ratio.den = get_bits(&gb, 24);
+        st->codec->sample_aspect_ratio.num = get_bits_long(&gb, 24);
+        st->codec->sample_aspect_ratio.den = get_bits_long(&gb, 24);
 
         if (version >= 0x030200)
             skip_bits(&gb, 38);