diff --git a/webrtc/video_engine/test/android/android_video_demo.gypi b/webrtc/video_engine/test/android/android_video_demo.gypi index 2e1d648296..fa53e51102 100644 --- a/webrtc/video_engine/test/android/android_video_demo.gypi +++ b/webrtc/video_engine/test/android/android_video_demo.gypi @@ -23,7 +23,6 @@ 'link_settings': { 'libraries': [ '-llog', - '-lgcc', '-lGLESv2', '-lOpenSLES', ], diff --git a/webrtc/video_engine/test/android/jni/android_media_codec_decoder.cc b/webrtc/video_engine/test/android/jni/android_media_codec_decoder.cc index d7ef87b440..9e45c8e7f7 100644 --- a/webrtc/video_engine/test/android/jni/android_media_codec_decoder.cc +++ b/webrtc/video_engine/test/android/jni/android_media_codec_decoder.cc @@ -19,8 +19,7 @@ namespace webrtc { AndroidMediaCodecDecoder::AndroidMediaCodecDecoder( JavaVM* vm, jobject surface, jclass decoderClass) - : decode_complete_callback_(NULL), - vm_(vm), + : vm_(vm), surface_(NULL), mediaCodecDecoder_(NULL), decoderClass_(NULL), diff --git a/webrtc/video_engine/test/android/jni/android_media_codec_decoder.h b/webrtc/video_engine/test/android/jni/android_media_codec_decoder.h index 978d1f3eb3..5fd242142d 100644 --- a/webrtc/video_engine/test/android/jni/android_media_codec_decoder.h +++ b/webrtc/video_engine/test/android/jni/android_media_codec_decoder.h @@ -94,7 +94,6 @@ class AndroidMediaCodecDecoder : public VideoDecoder { private: void Initialize(JavaVM* vm, jobject surface, jclass decoderClass); - DecodedImageCallback* decode_complete_callback_; JavaVM* vm_; jobject surface_; jobject mediaCodecDecoder_;