Remove double declaration of 2 conversion functions.
The declaration in common_types.h is probably a left-over from a previous cleanup. Bug: None Change-Id: I3ee1bad2494ede0022c6aa8fdd106035471d50e2 Reviewed-on: https://webrtc-review.googlesource.com/99220 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24666}
This commit is contained in:

committed by
Commit Bot

parent
49b2c3c4c4
commit
04255172b6
@ -342,10 +342,6 @@ enum VideoCodecType {
|
|||||||
kVideoCodecMultiplex,
|
kVideoCodecMultiplex,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Translates from name of codec to codec type and vice versa.
|
|
||||||
const char* CodecTypeToPayloadString(VideoCodecType type);
|
|
||||||
VideoCodecType PayloadStringToCodecType(const std::string& name);
|
|
||||||
|
|
||||||
struct SpatialLayer {
|
struct SpatialLayer {
|
||||||
bool operator==(const SpatialLayer& other) const;
|
bool operator==(const SpatialLayer& other) const;
|
||||||
bool operator!=(const SpatialLayer& other) const { return !(*this == other); }
|
bool operator!=(const SpatialLayer& other) const { return !(*this == other); }
|
||||||
|
@ -10,6 +10,8 @@
|
|||||||
|
|
||||||
#include "media/engine/webrtcvideodecoderfactory.h"
|
#include "media/engine/webrtcvideodecoderfactory.h"
|
||||||
|
|
||||||
|
#include "api/video_codecs/video_codec.h"
|
||||||
|
|
||||||
namespace cricket {
|
namespace cricket {
|
||||||
|
|
||||||
webrtc::VideoDecoder* WebRtcVideoDecoderFactory::CreateVideoDecoderWithParams(
|
webrtc::VideoDecoder* WebRtcVideoDecoderFactory::CreateVideoDecoderWithParams(
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
|
#include "api/video_codecs/video_codec.h"
|
||||||
#include "modules/rtp_rtcp/source/byte_io.h"
|
#include "modules/rtp_rtcp/source/byte_io.h"
|
||||||
#include "rtc_base/checks.h"
|
#include "rtc_base/checks.h"
|
||||||
#include "rtc_base/logging.h"
|
#include "rtc_base/logging.h"
|
||||||
|
Reference in New Issue
Block a user