diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java b/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java
index 5a19970d3c..43be1784de 100644
--- a/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java
+++ b/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java
@@ -56,16 +56,12 @@ public class ContainerMediaChunk extends BaseMediaChunk implements SingleTrackMe
    *     the data is known to define its own sample format.
    * @param drmInitData The {@link DrmInitData} for the chunk. Null if the media is not drm
    *     protected. May also be null if the data is known to define its own initialization data.
-   * @param isSampleFormatFinal True if {@code sampleFormat} and {@code drmInitData} are known to be
-   *     correct and final. False if the data may define its own sample format or initialization
-   *     data.
    */
   public ContainerMediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger, Format format,
       long startTimeUs, long endTimeUs, int chunkIndex, long sampleOffsetUs,
-      ChunkExtractorWrapper extractorWrapper, Format sampleFormat, DrmInitData drmInitData,
-      boolean isSampleFormatFinal) {
+      ChunkExtractorWrapper extractorWrapper, Format sampleFormat, DrmInitData drmInitData) {
     super(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex,
-        isSampleFormatFinal);
+        sampleFormat != null);
     this.extractorWrapper = extractorWrapper;
     this.sampleOffsetUs = sampleOffsetUs;
     this.sampleFormat = getAdjustedSampleFormat(sampleFormat, sampleOffsetUs);
diff --git a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java b/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
index 68ee85b20f..7a7fff2f91 100644
--- a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
+++ b/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
@@ -405,11 +405,10 @@ public class DashChunkSource implements ChunkSource {
       return new SingleSampleMediaChunk(dataSource, dataSpec, Chunk.TRIGGER_INITIAL, trackFormat,
           startTimeUs, endTimeUs, segmentNum, trackFormat, null);
     } else {
-      boolean isSampleFormatFinal = sampleFormat != null;
       long sampleOffsetUs = -representation.presentationTimeOffsetUs;
       return new ContainerMediaChunk(dataSource, dataSpec, trigger, trackFormat, startTimeUs,
           endTimeUs, segmentNum, sampleOffsetUs, representationHolder.extractorWrapper,
-          sampleFormat, drmInitData, isSampleFormatFinal);
+          sampleFormat, drmInitData);
     }
   }
 
diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java
index 3e5bdf1135..b3d9a82234 100644
--- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java
+++ b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java
@@ -360,8 +360,7 @@ public class SmoothStreamingChunkSource implements ChunkSource {
     // To convert them the absolute timestamps, we need to set sampleOffsetUs to chunkStartTimeUs.
     long sampleOffsetUs = chunkStartTimeUs;
     return new ContainerMediaChunk(dataSource, dataSpec, trigger, format, chunkStartTimeUs,
-        chunkEndTimeUs, chunkIndex, sampleOffsetUs, extractorWrapper, sampleFormat, drmInitData,
-        true);
+        chunkEndTimeUs, chunkIndex, sampleOffsetUs, extractorWrapper, sampleFormat, drmInitData);
   }
 
   private static byte[] getProtectionElementKeyId(byte[] initData) {