am 3d0ef858: Merge "Handle IOException from MediaCodec factory methods"

* commit '3d0ef8581abe522c747ea891ae797eeaffc84aa4':
  Handle IOException from MediaCodec factory methods
This commit is contained in:
Andy Hung
2014-01-21 15:10:02 -08:00
committed by Android Git Automerger

View File

@@ -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;