diff options
| -rw-r--r-- | media/libstagefright/MP3Extractor.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/codecs/aacenc/AACEncoder.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp index eb4c68d..03ce202 100644 --- a/media/libstagefright/MP3Extractor.cpp +++ b/media/libstagefright/MP3Extractor.cpp @@ -39,10 +39,10 @@ namespace android { // Everything must match except for -// protection, bitrate, padding, private bits, mode extension, +// protection, bitrate, padding, private bits, mode, mode extension, // copyright bit, original bit and emphasis. // Yes ... there are things that must indeed match... -static const uint32_t kMask = 0xfffe0cc0; +static const uint32_t kMask = 0xfffe0c00; // static bool MP3Extractor::get_mp3_frame_size( diff --git a/media/libstagefright/codecs/aacenc/AACEncoder.cpp b/media/libstagefright/codecs/aacenc/AACEncoder.cpp index a8b1292..e4ff128 100644 --- a/media/libstagefright/codecs/aacenc/AACEncoder.cpp +++ b/media/libstagefright/codecs/aacenc/AACEncoder.cpp @@ -189,6 +189,9 @@ status_t AACEncoder::stop() { delete mApiHandle; mApiHandle = NULL; + delete mMemOperator; + mMemOperator = NULL; + mStarted = false; return OK; |