[GNUnet-SVN] r11620 - Extractor/src/plugins

[gnunet]

Author: grothoff
Date: 2010-06-06 12:58:51 +0200 (Sun, 06 Jun 2010)
New Revision: 11620

Modified:
   Extractor/src/plugins/mp3_extractor.c
Log:
fix

Modified: Extractor/src/plugins/mp3_extractor.c
===================================================================
--- Extractor/src/plugins/mp3_extractor.c       2010-06-06 10:53:30 UTC (rev 
11619)
+++ Extractor/src/plugins/mp3_extractor.c       2010-06-06 10:58:51 UTC (rev 
11620)
@@ -149,7 +149,6 @@
   while (counter < MAX_MP3_SCAN_DEEP);
   if (counter >= MAX_MP3_SCAN_DEEP)
     return 0;
-  ADDR ("audio/mpeg", EXTRACTOR_METATYPE_MIMETYPE);
 
   do
     {                           /*ok, now we found a mp3 frame header */
@@ -167,8 +166,7 @@
           break;
         case (MPA_VERSION_MASK):
         default:
-          mpeg_ver = MPEG_ERR;  /*error */
-          break;
+          return 0;
         }
       switch (header & (MPA_LAYER_MASK << MPA_LAYER_SHIFT))
         {
@@ -183,7 +181,7 @@
           break;
         case 0x0:
         default:
-          layer = LAYER_ERR;        /*error */
+          return 0;
         }
       if (!layer || !mpeg_ver)
         return 0;            /*unknown mpeg type */
@@ -227,6 +225,7 @@
 
   if (!frames)
     return 0;                /*no valid frames */
+  ADDR ("audio/mpeg", EXTRACTOR_METATYPE_MIMETYPE);
   avg_bps = avg_bps / frames;
   if (max_frames_scan)
     {                           /*if not all frames scaned */