am 5a58de8b: am 2f133015: Merge change I5126e183 into eclair-mr2

Merge commit '5a58de8b3bb1b6cc5304f83c8a3d527f952b91de'

* commit '5a58de8b3bb1b6cc5304f83c8a3d527f952b91de':
  Fix MP3Extractor duration overflows...

media/libstagefright/MP3Extractor.cpp

@@ -373,7 +373,7 @@ MP3Extractor::MP3Extractor(const sp<DataSource> &source)
         if (mDataSource->getSize(&fileSize) == OK) {
             mMeta->setInt64(
                     kKeyDuration,
-                    8000 * (fileSize - mFirstFramePos) / bitrate);
+                    8000LL * (fileSize - mFirstFramePos) / bitrate);
         }
     }
 }