From 39fcfd78ae291a7182aaf31bfe19887f78c1fc97 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 14 Jan 2014 12:55:59 +0000 Subject: [PATCH] Remove empty VideoCodecGeneric struct. Struct was added prematurely and triggers a warning with -Wextern-c-compat in latest clang. R=henrika@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/7119004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5383 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/common_types.h | 6 ------ webrtc/modules/video_coding/main/source/codec_database.cc | 6 ------ 2 files changed, 12 deletions(-) diff --git a/webrtc/common_types.h b/webrtc/common_types.h index 0ae01a626b..3601508782 100644 --- a/webrtc/common_types.h +++ b/webrtc/common_types.h @@ -612,11 +612,6 @@ struct VideoCodecVP8 int keyFrameInterval; }; -// Unknown specific -struct VideoCodecGeneric -{ -}; - // Video codec types enum VideoCodecType { @@ -631,7 +626,6 @@ enum VideoCodecType union VideoCodecUnion { VideoCodecVP8 VP8; - VideoCodecGeneric Generic; }; diff --git a/webrtc/modules/video_coding/main/source/codec_database.cc b/webrtc/modules/video_coding/main/source/codec_database.cc index e41c6b4253..60794f27b5 100644 --- a/webrtc/modules/video_coding/main/source/codec_database.cc +++ b/webrtc/modules/video_coding/main/source/codec_database.cc @@ -338,12 +338,6 @@ bool VCMCodecDataBase::RequiresEncoderReset(const VideoCodec& new_send_codec) { } break; case kVideoCodecGeneric: - if (memcmp(&new_send_codec.codecSpecific.Generic, - &send_codec_.codecSpecific.Generic, - sizeof(new_send_codec.codecSpecific.Generic)) != - 0) { - return true; - } break; // Known codecs without payload-specifics case kVideoCodecI420: