| Index: webrtc/modules/video_coding/codecs/interface/video_codec_interface.h
|
| diff --git a/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h b/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h
|
| index a7bf62fdad8928d170790b6dcca991d4ab2ad864..6bcfa909bd27e745a909e5426d4b0bfe2e078747 100644
|
| --- a/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h
|
| +++ b/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h
|
| @@ -8,11 +8,11 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_
|
| -#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_
|
| -
|
| -#pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; use video_coding/include")
|
| +#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_
|
| +#define WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_
|
|
|
| +#pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; "
|
| + "use video_coding/include")
|
| #include <vector>
|
|
|
| #include "webrtc/common_types.h"
|
| @@ -23,10 +23,9 @@
|
| #include "webrtc/video_encoder.h"
|
| #include "webrtc/video_frame.h"
|
|
|
| -namespace webrtc
|
| -{
|
| +namespace webrtc {
|
|
|
| -class RTPFragmentationHeader; // forward declaration
|
| +class RTPFragmentationHeader; // forward declaration
|
|
|
| // Note: if any pointers are added to this struct, it must be fitted
|
| // with a copy-constructor. See below.
|
| @@ -92,12 +91,11 @@ union CodecSpecificInfoUnion {
|
| // Note: if any pointers are added to this struct or its sub-structs, it
|
| // must be fitted with a copy-constructor. This is because it is copied
|
| // in the copy-constructor of VCMEncodedFrame.
|
| -struct CodecSpecificInfo
|
| -{
|
| - VideoCodecType codecType;
|
| - CodecSpecificInfoUnion codecSpecific;
|
| +struct CodecSpecificInfo {
|
| + VideoCodecType codecType;
|
| + CodecSpecificInfoUnion codecSpecific;
|
| };
|
|
|
| } // namespace webrtc
|
|
|
| -#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_
|
| +#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_
|
|
|