commit e41d774c4d0a60066866fc2d0ae48dd0e839ff23
author Per <perkj@chromium.org> Tue Apr 07 17:20:48 2015 +0200
committer Per <perkj@chromium.org> Tue Apr 07 15:20:56 2015 +0000
tree 5e09be7e31b5af694d7c858bef39eb612bc3fb72
parent 3b71efc56e96009d8bfa80b1db2dc7da31bdca21

Revert "Remove usage of webrtc::NativeHandle since is just adds an extra level of indirection."

This reverts commit 75db8612588b4fabdf1b05f4ab145f7737093b45.

Revert "Fix build breakage in WrappedI420Buffer::native_handle()"

This reverts commit 3211934ebf7cac3e6df2cb4aacb6e47cc1cffe2b.

Reason for revert: Breaks chrome build and tests on clank, See https://codereview.chromium.org/1067803002/

BUG=1128
TBR=magjed@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/43079004

Cr-Commit-Position: refs/heads/master@{#8940}

talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

diff --git a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
index 2c2c12d..da6921f 100644
--- a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
+++ b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
@@ -654,9 +654,8 @@
   int32_t callback_status = WEBRTC_VIDEO_CODEC_OK;
   if (use_surface_) {
     native_handle_.SetTextureObject(surface_texture_, texture_id);
-    I420VideoFrame texture_image(&native_handle_, width, height,
-                                 output_timestamp_, 0, webrtc::kVideoRotation_0,
-                                 rtc::Callback0<void>());
+    I420VideoFrame texture_image(
+        &native_handle_, width, height, output_timestamp_, 0);
     texture_image.set_ntp_time_ms(output_ntp_time_ms_);
     callback_status = callback_->Decoded(texture_image);
   } else {