diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index f06c9da048..df01df1708 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -179,6 +179,10 @@ public final class Format implements Parcelable {
 
   // Video.
 
+  /**
+   * @deprecated Use {@link #createVideoContainerFormat(String, String, String, String, String, int,
+   *     int, int, float, List, int, int)} instead.
+   */
   @Deprecated
   public static Format createVideoContainerFormat(
       @Nullable String id,
@@ -358,6 +362,10 @@ public final class Format implements Parcelable {
 
   // Audio.
 
+  /**
+   * @deprecated Use {@link #createAudioContainerFormat(String, String, String, String, String, int,
+   *     int, int, List, int, int, String)} instead.
+   */
   @Deprecated
   public static Format createAudioContainerFormat(
       @Nullable String id,
@@ -763,6 +771,10 @@ public final class Format implements Parcelable {
 
   // Generic.
 
+  /**
+   * @deprecated Use {@link #createContainerFormat(String, String, String, String, String, int, int,
+   *     int, String)} instead.
+   */
   @Deprecated
   public static Format createContainerFormat(
       @Nullable String id,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
index 9e7da87766..ee731cbc09 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
@@ -58,7 +58,7 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> {
 
   }
 
-  /** Use {@link ProgressiveMediaSource.Factory} instead. */
+  /** @deprecated Use {@link ProgressiveMediaSource.Factory} instead. */
   @Deprecated
   public static final class Factory implements MediaSourceFactory {
 
@@ -221,6 +221,9 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> {
     }
   }
 
+  /**
+   * @deprecated Use {@link ProgressiveMediaSource#DEFAULT_LOADING_CHECK_INTERVAL_BYTES} instead.
+   */
   @Deprecated
   public static final int DEFAULT_LOADING_CHECK_INTERVAL_BYTES =
       ProgressiveMediaSource.DEFAULT_LOADING_CHECK_INTERVAL_BYTES;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
index 07155ee2bc..17fb4ad7a1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
@@ -183,18 +183,21 @@ public interface HttpDataSource extends DataSource {
       return defaultRequestProperties;
     }
 
+    /** @deprecated Use {@link #getDefaultRequestProperties} instead. */
     @Deprecated
     @Override
     public final void setDefaultRequestProperty(String name, String value) {
       defaultRequestProperties.set(name, value);
     }
 
+    /** @deprecated Use {@link #getDefaultRequestProperties} instead. */
     @Deprecated
     @Override
     public final void clearDefaultRequestProperty(String name) {
       defaultRequestProperties.remove(name);
     }
 
+    /** @deprecated Use {@link #getDefaultRequestProperties} instead. */
     @Deprecated
     @Override
     public final void clearAllDefaultRequestProperties() {