aboutsummaryrefslogtreecommitdiff
path: root/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h
diff options
context:
space:
mode:
authorpbos <pbos@webrtc.org>2015-10-19 02:39:06 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-19 09:39:15 +0000
commit22993e1a0c114122fc1b9de0fc74d4096ec868bd (patch)
tree7512c1e0449b2abd4e8d9ef0051b9f8a6a6728a7 /webrtc/modules/video_coding/codecs/vp9/vp9_impl.h
parent4306fc70d778887d8a2ea71b6f4bc6a12d1d9447 (diff)
downloadwebrtc-22993e1a0c114122fc1b9de0fc74d4096ec868bd.tar.gz
Unify FrameType and VideoFrameType.
Prevents some heap allocation and frame-type conversion since interfaces mismatch. Also it's less confusing to have one type for this. BUG=webrtc:5042 R=magjed@webrtc.org, mflodman@webrtc.org, henrik.lundin@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org Review URL: https://codereview.webrtc.org/1371043003 Cr-Commit-Position: refs/heads/master@{#10320}
Diffstat (limited to 'webrtc/modules/video_coding/codecs/vp9/vp9_impl.h')
-rw-r--r--webrtc/modules/video_coding/codecs/vp9/vp9_impl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h
index c164a63980..f9c123079e 100644
--- a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h
+++ b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h
@@ -35,7 +35,7 @@ class VP9EncoderImpl : public VP9Encoder {
int Encode(const VideoFrame& input_image,
const CodecSpecificInfo* codec_specific_info,
- const std::vector<VideoFrameType>* frame_types) override;
+ const std::vector<FrameType>* frame_types) override;
int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override;