diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-11-12 19:44:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 19:44:03 +0000 |
| commit | 0c094f0ca7eadac67240fc541f27b8f902d76f4a (patch) | |
| tree | 0a46de02d6e93cf12182b0b1b11e6d85f1fd2741 /samples/browseable/BasicRenderScript/src | |
| parent | 13ce376eea001a9942dc418323c3fd2980cbf299 (diff) | |
| parent | d8c7b24e696003e4fc4c848a3f2a86b302f90169 (diff) | |
| download | android_development-0c094f0ca7eadac67240fc541f27b8f902d76f4a.tar.gz android_development-0c094f0ca7eadac67240fc541f27b8f902d76f4a.tar.bz2 android_development-0c094f0ca7eadac67240fc541f27b8f902d76f4a.zip | |
am d8c7b24e: Merge "Update browseable samples for lmp-docs" into lmp-docs
* commit 'd8c7b24e696003e4fc4c848a3f2a86b302f90169':
Update browseable samples for lmp-docs
Diffstat (limited to 'samples/browseable/BasicRenderScript/src')
| -rw-r--r-- | samples/browseable/BasicRenderScript/src/com.example.android.common.media/MediaCodecWrapper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/samples/browseable/BasicRenderScript/src/com.example.android.common.media/MediaCodecWrapper.java b/samples/browseable/BasicRenderScript/src/com.example.android.common.media/MediaCodecWrapper.java index a511221f5..a48337404 100644 --- a/samples/browseable/BasicRenderScript/src/com.example.android.common.media/MediaCodecWrapper.java +++ b/samples/browseable/BasicRenderScript/src/com.example.android.common.media/MediaCodecWrapper.java @@ -21,6 +21,7 @@ import android.os.Handler; import android.os.Looper; import android.view.Surface; +import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayDeque; import java.util.Queue; @@ -136,7 +137,7 @@ public class MediaCodecWrapper { * @return */ public static MediaCodecWrapper fromVideoFormat(final MediaFormat trackFormat, - Surface surface) { + Surface surface) throws IOException { MediaCodecWrapper result = null; MediaCodec videoCodec = null; |