cleanup SoftFFmpegVideo

diff --git a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
index ab4a4d1..b123df5 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
+++ b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
@@ -306,13 +306,12 @@ status_t SoftFFmpegVideo::initDecoder() {
 }
 
 void SoftFFmpegVideo::deInitDecoder() {
-    if (mCodec) {
-        mCodec = NULL;
-    }
-
     if (mCtx) {
-        if (!mCtx->extradata)
+        if (!mCtx->extradata) {
             av_free(mCtx->extradata);
+            mCtx->extradata = NULL;
+            mCtx->extradata_size = 0;
+        }
         avcodec_close(mCtx);
         av_free(mCtx);
         mCtx = NULL;

diff --git a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h
index efa82f3..f9b308b 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h
+++ b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h
@@ -100,7 +100,6 @@ private:
     };
 
     AVCodecContext *mCtx;
-    AVCodec *mCodec;
     struct SwsContext *mImgConvertCtx;
 
     bool mExtradataReady;