Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9bd146c authored by Dichen Zhang's avatar Dichen Zhang Committed by Automerger Merge Worker
Browse files

Merge "Fix javadoc error for MediaFormat.KEY_BITRATE_MODE" am: b7c18f23 am:... 

Merge "Fix javadoc error for MediaFormat.KEY_BITRATE_MODE" am: b7c18f23 am: a31af1d4 am: 73f2de36

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2480317



Change-Id: I2c0197c4a683d724597984d9ebf8e89ec3feb5cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25126020 73f2de36

media/java/android/media/MediaFormat.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1210,7 +1210,7 @@ public final class MediaFormat { 




    /**

    /**

     * A key describing the desired bitrate mode to be used by an encoder.

     * A key describing the desired bitrate mode to be used by an encoder.

     * Constants are declared in {@link MediaCodecInfo.CodecCapabilities}.

     * Constants are declared in {@link MediaCodecInfo.EncoderCapabilities}.

     *

     *

     * @see MediaCodecInfo.EncoderCapabilities#isBitrateModeSupported(int)

     * @see MediaCodecInfo.EncoderCapabilities#isBitrateModeSupported(int)

     */

     */