remove static vars which are now inherited

havlenapetr · havlenapetr · commit cd65948429f4 · 2010-07-31T17:43:05.000+02:00
diff --git a/jni/libmediaplayer/decoder_audio.cpp b/jni/libmediaplayer/decoder_audio.cpp
@@ -5,15 +5,12 @@
 
 #define TAG "FFMpegAudioDecoder"
 
-static DecoderAudio* sInstance;
-
 DecoderAudio::DecoderAudio(AVCodecContext*            codec_ctx,
 						   struct DecoderAudioConfig* config)
 {
     mQueue = new PacketQueue();
     mCodecCtx = codec_ctx; 
     mConfig = config;
-    sInstance = this;
 }
 
 DecoderAudio::~DecoderAudio()
diff --git a/jni/libmediaplayer/decoder_video.cpp b/jni/libmediaplayer/decoder_video.cpp
@@ -3,13 +3,10 @@
 
 #define TAG "FFMpegVideoDecoder"
 
-static DecoderVideo* sInstance;
-
 DecoderVideo::DecoderVideo(AVCodecContext* codec_ctx)
 {
     mQueue = new PacketQueue();
     mCodecCtx = codec_ctx; 
-    sInstance = this;
 }
 
 DecoderVideo::~DecoderVideo()

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,12 @@`
`5`	`5`
`6`	`6`	`#define TAG "FFMpegAudioDecoder"`
`7`	`7`
`8`		`-static DecoderAudio* sInstance;`
`9`		`-`
`10`	`8`	`DecoderAudio::DecoderAudio(AVCodecContext* codec_ctx,`
`11`	`9`	`struct DecoderAudioConfig* config)`
`12`	`10`	`{`
`13`	`11`	`mQueue = new PacketQueue();`
`14`	`12`	`mCodecCtx = codec_ctx;`
`15`	`13`	`mConfig = config;`
`16`		`- sInstance = this;`
`17`	`14`	`}`
`18`	`15`
`19`	`16`	`DecoderAudio::~DecoderAudio()`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,10 @@`
`3`	`3`
`4`	`4`	`#define TAG "FFMpegVideoDecoder"`
`5`	`5`
`6`		`-static DecoderVideo* sInstance;`
`7`		`-`
`8`	`6`	`DecoderVideo::DecoderVideo(AVCodecContext* codec_ctx)`
`9`	`7`	`{`
`10`	`8`	`mQueue = new PacketQueue();`
`11`	`9`	`mCodecCtx = codec_ctx;`
`12`		`- sInstance = this;`
`13`	`10`	`}`
`14`	`11`
`15`	`12`	`DecoderVideo::~DecoderVideo()`