summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt2
-rw-r--r--media/java/android/media/MediaFormat.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index c5b1b9461364..9661dcb7ce3d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25072,7 +25072,7 @@ package android.media {
field public static final String KEY_LANGUAGE = "language";
field public static final String KEY_LATENCY = "latency";
field public static final String KEY_LEVEL = "level";
- field public static final String KEY_MAX_BFRAMES = "max-bframes";
+ field public static final String KEY_MAX_B_FRAMES = "max-bframes";
field public static final String KEY_MAX_FPS_TO_ENCODER = "max-fps-to-encoder";
field public static final String KEY_MAX_HEIGHT = "max-height";
field public static final String KEY_MAX_INPUT_SIZE = "max-input-size";
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java
index a22c8d0a8457..4d63cc8825e3 100644
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -1060,7 +1060,7 @@ public final class MediaFormat {
* that no B frames are allowed. Note that non-zero value does not guarantee
* B frames; it's up to the encoder to decide.
*/
- public static final String KEY_MAX_BFRAMES = "max-bframes";
+ public static final String KEY_MAX_B_FRAMES = "max-bframes";
/* package private */ MediaFormat(@NonNull Map<String, Object> map) {
mMap = map;