generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unbreak clang/android build of webrtc.

Browse Source 
TESTED=All target builds once more with clang=1.
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1929004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4460 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2013-07-31 23:53:07 +00:00
parent 7fdbb1c832
commit d3ae3c7b1f
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/video_engine/test/android/android_video_demo.gypi
View File

@ -23,7 +23,6 @@
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'-llog', '-llog',
'-lgcc',
'-lGLESv2', '-lGLESv2',
'-lOpenSLES', '-lOpenSLES',
], ],

3
webrtc/video_engine/test/android/jni/android_media_codec_decoder.cc
View File

@ -19,8 +19,7 @@ namespace webrtc {
AndroidMediaCodecDecoder::AndroidMediaCodecDecoder( AndroidMediaCodecDecoder::AndroidMediaCodecDecoder(
JavaVM* vm, jobject surface, jclass decoderClass) JavaVM* vm, jobject surface, jclass decoderClass)
: decode_complete_callback_(NULL), : vm_(vm),
vm_(vm),
surface_(NULL), surface_(NULL),
mediaCodecDecoder_(NULL), mediaCodecDecoder_(NULL),
decoderClass_(NULL), decoderClass_(NULL),

1
webrtc/video_engine/test/android/jni/android_media_codec_decoder.h
View File

@ -94,7 +94,6 @@ class AndroidMediaCodecDecoder : public VideoDecoder {
private: private:
void Initialize(JavaVM* vm, jobject surface, jclass decoderClass); void Initialize(JavaVM* vm, jobject surface, jclass decoderClass);
DecodedImageCallback* decode_complete_callback_;
JavaVM* vm_; JavaVM* vm_;
jobject surface_; jobject surface_;
jobject mediaCodecDecoder_; jobject mediaCodecDecoder_;