libextractor

commit 7b62c01e87a1d2f5009f356fc0f3d70662b1e1a9
parent d881cabc2f55f3fe42170a90bffcc9493343068b
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun,  6 Jun 2010 10:58:51 +0000

fix

Diffstat:
M
src/plugins/mp3_extractor.c
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/plugins/mp3_extractor.c b/src/plugins/mp3_extractor.c
@@ -149,7 +149,6 @@ EXTRACTOR_mp3_extract (const unsigned char *data,
   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 @@ EXTRACTOR_mp3_extract (const unsigned char *data,
           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 @@ EXTRACTOR_mp3_extract (const unsigned char *data,
           break;
         case 0x0:
         default:
-          layer = LAYER_ERR;        /*error */
+          return 0;
         }
       if (!layer || !mpeg_ver)
         return 0;            /*unknown mpeg type */
@@ -227,6 +225,7 @@ EXTRACTOR_mp3_extract (const unsigned char *data,
 
   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 */