From 5ba3f1eea34e22ee71e2ef1f83e17b6a4d756fcf Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Tue, 28 Oct 2014 10:08:42 +0000 Subject: [PATCH] Fix build. --- .../android/exoplayer/parser/ts/TsExtractor.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/parser/ts/TsExtractor.java b/library/src/main/java/com/google/android/exoplayer/parser/ts/TsExtractor.java index cfdc261925..fd5ba369b9 100644 --- a/library/src/main/java/com/google/android/exoplayer/parser/ts/TsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer/parser/ts/TsExtractor.java @@ -28,7 +28,6 @@ import android.util.Log; import android.util.Pair; import android.util.SparseArray; -import java.nio.ByteBuffer; import java.util.Collections; import java.util.LinkedList; import java.util.Queue; @@ -237,13 +236,11 @@ public final class TsExtractor { private void convert(Sample in, SampleHolder out) { if (out.data == null || out.data.capacity() < in.size) { - if (out.allowDataBufferReplacement) { - out.data = ByteBuffer.allocate(in.size); - } else { - throw new IndexOutOfBoundsException("Buffer too small, and replacement not enabled"); - } + out.replaceBuffer(in.size); + } + if (out.data != null) { + out.data.put(in.data, 0, in.size); } - out.data.put(in.data, 0, in.size); out.size = in.size; out.flags = in.flags; out.timeUs = in.timeUs;