[FFmpeg-cvslog] r24540 - trunk/libavformat/mp3.c

cehoyos subversion
Tue Jul 27 12:11:06 CEST 2010


Author: cehoyos
Date: Tue Jul 27 12:11:05 2010
New Revision: 24540

Log:
Make frames unsigned.

Patch by Alexander Kojevnikov, alexander kojevnikov com

Modified:
   trunk/libavformat/mp3.c

Modified: trunk/libavformat/mp3.c
==============================================================================
--- trunk/libavformat/mp3.c	Tue Jul 27 12:08:34 2010	(r24539)
+++ trunk/libavformat/mp3.c	Tue Jul 27 12:11:05 2010	(r24540)
@@ -83,7 +83,7 @@ static int mp3_read_probe(AVProbeData *p
 static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base)
 {
     uint32_t v, spf;
-    int frames = -1; /* Total number of frames in file */
+    unsigned frames = 0; /* Total number of frames in file */
     unsigned size = 0; /* Total number of bytes in the stream */
     const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}};
     MPADecodeHeader c;
@@ -122,14 +122,14 @@ static int mp3_parse_vbr_tags(AVFormatCo
         }
     }
 
-    if(frames < 0 && !size)
+    if(!frames && !size)
         return -1;
 
     /* Skip the vbr tag frame */
     url_fseek(s->pb, base + vbrtag_size, SEEK_SET);
 
     spf = c.lsf ? 576 : 1152; /* Samples per frame, layer 3 */
-    if(frames >= 0)
+    if(frames)
         st->duration = av_rescale_q(frames, (AVRational){spf, c.sample_rate},
                                     st->time_base);
     if(size)



More information about the ffmpeg-cvslog mailing list