From c7e2bffb660d0b9fd152ed678bb07e3c875495a5 Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Tue, 6 Dec 2011 13:44:25 +0000 Subject: [PATCH] Fix header/lib mismatch caused by a constant not defined for header file. BUG=http://code.google.com/p/webrtc/issues/detail?id=170 TEST= Review URL: http://webrtc-codereview.appspot.com/300008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1110 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_coding/codecs/vp8/main/interface/vp8.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/modules/video_coding/codecs/vp8/main/interface/vp8.h b/src/modules/video_coding/codecs/vp8/main/interface/vp8.h index d8b1745741..8e7ff364b0 100644 --- a/src/modules/video_coding/codecs/vp8/main/interface/vp8.h +++ b/src/modules/video_coding/codecs/vp8/main/interface/vp8.h @@ -29,9 +29,7 @@ struct vpx_codec_cx_pkt; namespace webrtc { -#if WEBRTC_LIBVPX_VERSION >= 971 class TemporalLayers; -#endif class ReferencePictureSelection; /******************************/ @@ -149,9 +147,7 @@ private: WebRtc_Word32 GetEncodedFrame(const RawImage& input_image); -#if WEBRTC_LIBVPX_VERSION >= 971 WebRtc_Word32 GetEncodedPartitions(const RawImage& input_image); -#endif // Determine maximum target for Intra frames // @@ -176,13 +172,10 @@ private: WebRtc_UWord32 _rcMaxIntraTarget; int _tokenPartitions; ReferencePictureSelection* _rps; -#if WEBRTC_LIBVPX_VERSION >= 971 TemporalLayers* _temporalLayers; -#endif - - vpx_codec_ctx_t* _encoder; - vpx_codec_enc_cfg_t* _cfg; - vpx_image_t* _raw; + vpx_codec_ctx_t* _encoder; + vpx_codec_enc_cfg_t* _cfg; + vpx_image_t* _raw; };// end of VP8Encoder class /******************************/