Index: webrtc/modules/video_coding/codecs/h264/include/h264.h |
diff --git a/webrtc/modules/video_coding/codecs/h264/include/h264.h b/webrtc/modules/video_coding/codecs/h264/include/h264.h |
index 467845de8fa5875b1c88d68c4562027830be797d..2d92473ab55c26dc3cf8c4dd01cef1822e8d7a46 100644 |
--- a/webrtc/modules/video_coding/codecs/h264/include/h264.h |
+++ b/webrtc/modules/video_coding/codecs/h264/include/h264.h |
@@ -12,16 +12,7 @@ |
#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_ |
#define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_ |
-#if defined(WEBRTC_IOS) || defined(WEBRTC_MAC) |
- |
-#include <Availability.h> |
-#if defined(WEBRTC_IOS) || \ |
- defined(__MAC_10_8) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_8 |
-#define WEBRTC_VIDEO_TOOLBOX_SUPPORTED 1 |
-#endif |
- |
-#endif // defined(WEBRTC_IOS) || defined(WEBRTC_MAC) |
- |
+#include "webrtc/media/base/codec.h" |
#include "webrtc/modules/video_coding/include/video_codec_interface.h" |
namespace webrtc { |
@@ -34,7 +25,7 @@ void DisableRtcUseH264(); |
class H264Encoder : public VideoEncoder { |
public: |
- static H264Encoder* Create(); |
+ static H264Encoder* Create(const cricket::VideoCodec& codec); |
// If H.264 is supported (any implementation). |
static bool IsSupported(); |