diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/flv/AudioTagPayloadReader.java b/library/src/main/java/com/google/android/exoplayer/extractor/flv/AudioTagPayloadReader.java
index 470a2eaf3f..446cab92f8 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/flv/AudioTagPayloadReader.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/flv/AudioTagPayloadReader.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer.extractor.flv;
 
-import android.util.Pair;
 import com.google.android.exoplayer.C;
 import com.google.android.exoplayer.MediaFormat;
 import com.google.android.exoplayer.extractor.TrackOutput;
@@ -24,6 +23,8 @@ import com.google.android.exoplayer.util.MimeTypes;
 import com.google.android.exoplayer.util.ParsableBitArray;
 import com.google.android.exoplayer.util.ParsableByteArray;
 
+import android.util.Pair;
+
 import java.util.Collections;
 
 /**
@@ -108,9 +109,10 @@ final class AudioTagPayloadReader extends TagPayloadReader {
       Pair<Integer, Integer> audioParams = CodecSpecificDataUtil.parseAacAudioSpecificConfig(
           audioSpecificConfig);
 
-      MediaFormat mediaFormat = MediaFormat.createAudioFormat(MimeTypes.AUDIO_AAC,
-          MediaFormat.NO_VALUE, MediaFormat.NO_VALUE, durationUs, audioParams.second,
-          audioParams.first, Collections.singletonList(audioSpecificConfig), null);
+      MediaFormat mediaFormat = MediaFormat.createAudioFormat(MediaFormat.NO_VALUE,
+          MimeTypes.AUDIO_AAC, MediaFormat.NO_VALUE, MediaFormat.NO_VALUE, durationUs,
+          audioParams.second, audioParams.first, Collections.singletonList(audioSpecificConfig),
+          null);
 
       output.format(mediaFormat);
       hasOutputFormat = true;
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/flv/VideoTagPayloadReader.java b/library/src/main/java/com/google/android/exoplayer/extractor/flv/VideoTagPayloadReader.java
index 19704f2b2f..e02a9f516c 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/flv/VideoTagPayloadReader.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/flv/VideoTagPayloadReader.java
@@ -15,8 +15,6 @@
  */
 package com.google.android.exoplayer.extractor.flv;
 
-import android.util.Log;
-
 import com.google.android.exoplayer.C;
 import com.google.android.exoplayer.MediaFormat;
 import com.google.android.exoplayer.ParserException;
@@ -28,6 +26,8 @@ import com.google.android.exoplayer.util.NalUnitUtil;
 import com.google.android.exoplayer.util.ParsableBitArray;
 import com.google.android.exoplayer.util.ParsableByteArray;
 
+import android.util.Log;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -112,9 +112,10 @@ final class VideoTagPayloadReader extends TagPayloadReader {
       }
 
       // Construct and output the format.
-      MediaFormat mediaFormat = MediaFormat.createVideoFormat(MimeTypes.VIDEO_H264,
-          MediaFormat.NO_VALUE, MediaFormat.NO_VALUE, durationUs, avcData.width, avcData.height,
-          avcData.initializationData, MediaFormat.NO_VALUE, avcData.pixelWidthAspectRatio);
+      MediaFormat mediaFormat = MediaFormat.createVideoFormat(MediaFormat.NO_VALUE,
+          MimeTypes.VIDEO_H264, MediaFormat.NO_VALUE, MediaFormat.NO_VALUE, durationUs,
+          avcData.width, avcData.height, avcData.initializationData, MediaFormat.NO_VALUE,
+          avcData.pixelWidthAspectRatio);
       output.format(mediaFormat);
       hasOutputFormat = true;
     } else if (packetType == AVC_PACKET_TYPE_AVC_NALU) {