[FFmpeg-cvslog] r9314 - in trunk/libavformat: oggparseflac.c oggparsetheora.c

mru subversion
Thu Jun 14 20:14:36 CEST 2007


Author: mru
Date: Thu Jun 14 20:14:35 2007
New Revision: 9314

Log:
use get_bits_long() where needed
patch by Aurelien Jacobs, aurel gnuage org


Modified:
   trunk/libavformat/oggparseflac.c
   trunk/libavformat/oggparsetheora.c

Modified: trunk/libavformat/oggparseflac.c
==============================================================================
--- trunk/libavformat/oggparseflac.c	(original)
+++ trunk/libavformat/oggparseflac.c	Thu Jun 14 20:14:35 2007
@@ -49,7 +49,7 @@ flac_header (AVFormatContext * s, int id
         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);

Modified: trunk/libavformat/oggparsetheora.c
==============================================================================
--- trunk/libavformat/oggparsetheora.c	(original)
+++ trunk/libavformat/oggparsetheora.c	Thu Jun 14 20:14:35 2007
@@ -86,12 +86,12 @@ theora_header (AVFormatContext * s, int 
 
         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);




More information about the ffmpeg-cvslog mailing list