| Index: webrtc/video/video_receive_stream.cc
|
| diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc
|
| index 609a789fa2b530a2d65ecdb29c10fe98ee1b66eb..35e22c8ca85a02a64d3483531324a96a9c217718 100644
|
| --- a/webrtc/video/video_receive_stream.cc
|
| +++ b/webrtc/video/video_receive_stream.cc
|
| @@ -321,7 +321,7 @@ void VideoReceiveStream::OnFrame(const VideoFrame& video_frame) {
|
|
|
| // TODO(asapersson): Consider moving callback from video_encoder.h or
|
| // creating a different callback.
|
| -int32_t VideoReceiveStream::Encoded(
|
| +EncodedImageCallback::Result VideoReceiveStream::OnEncodedImage(
|
| const EncodedImage& encoded_image,
|
| const CodecSpecificInfo* codec_specific_info,
|
| const RTPFragmentationHeader* fragmentation) {
|
| @@ -345,7 +345,7 @@ int32_t VideoReceiveStream::Encoded(
|
| }
|
| }
|
|
|
| - return 0;
|
| + return Result(Result::OK, encoded_image._timeStamp);
|
| }
|
|
|
| bool VideoReceiveStream::DecodeThreadFunction(void* ptr) {
|
|
|