| Index: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h
|
| diff --git a/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.h b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h
|
| similarity index 84%
|
| rename from webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.h
|
| rename to webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h
|
| index d81c1121b749e3e05607cdb1a5787ccf322adfc4..1fbccdacf4db8b6646ab82fc0f0a22a1d0cbc547 100644
|
| --- a/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.h
|
| +++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h
|
| @@ -9,11 +9,13 @@
|
| *
|
| */
|
|
|
| -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_H264_VIDEO_TOOLBOX_DECODER_H_
|
| -#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_H264_VIDEO_TOOLBOX_DECODER_H_
|
| +#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_DECODER_H_
|
| +#define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_DECODER_H_
|
|
|
| #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
|
|
|
| +#if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
|
| +
|
| #include <VideoToolbox/VideoToolbox.h>
|
|
|
| // This file provides a H264 encoder implementation using the VideoToolbox
|
| @@ -56,4 +58,5 @@ class H264VideoToolboxDecoder : public H264Decoder {
|
|
|
| } // namespace webrtc
|
|
|
| -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_H264_VIDEO_TOOLBOX_DECODER_H_
|
| +#endif // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
|
| +#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_DECODER_H_
|
|
|