summaryrefslogtreecommitdiff
path: root/common_types.h
diff options
context:
space:
mode:
authormallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-03-25 18:44:58 +0000
committermallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-03-25 18:44:58 +0000
commit2a0cbfcbdeae0a1a2bd9571242091d95f42468f9 (patch)
treef02fe104a673c3898f73e94bb0a018317de2b525 /common_types.h
parent60ae79477f4652365c51037dc9eeae5c3584906d (diff)
downloadwebrtc-2a0cbfcbdeae0a1a2bd9571242091d95f42468f9.tar.gz
Removing VideoCodecDerived and moving methods inside VideoCodec.
VideoCodecDerived added to handle changes to talk (fakewebrtcvideoengine.h). R=mflodman@webrtc.org TBR=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/10569004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5784 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'common_types.h')
-rw-r--r--common_types.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/common_types.h b/common_types.h
index b1f1ba05..5d63a61d 100644
--- a/common_types.h
+++ b/common_types.h
@@ -658,13 +658,7 @@ struct VideoCodec {
// When using an external encoder/decoder this allows to pass
// extra options without requiring webrtc to be aware of them.
Config* extra_options;
-};
-// TODO(mallinath) - Remove this and push these two methods inside VideoCodec.
-// This is done to handle operator== defined in fakewebrtcvideoengine.h
-// This modification allows us to commit this CL directly and not with libjingle
-// push.
-struct VideoCodecDerived : public VideoCodec {
bool operator==(const VideoCodec& other) const {
bool ret = codecType == other.codecType &&
(STR_CASE_CMP(plName, other.plName) == 0) &&