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

Commit aa1668d4 authored by Songyue Han's avatar Songyue Han Committed by Automerger Merge Worker
Browse files

Merge "Removing the INFO_OUTPUT_BUFFERS_CHANGED from MediaCodecConstants.h."... 

Merge "Removing the INFO_OUTPUT_BUFFERS_CHANGED from MediaCodecConstants.h." into main am: 59016ea4

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3132820



Change-Id: I1520b948a69c618cfeab814d86d4f6e80d94c0fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77c75812 59016ea4

media/libstagefright/include/media/stagefright/MediaCodecConstants.h

+0 −1
Original line number Diff line number Diff line
@@ -882,7 +882,6 @@ inline constexpr int32_t CONFIGURE_FLAG_USE_BLOCK_MODEL = 2; 
inline constexpr int32_t CRYPTO_MODE_AES_CBC     = 2;

inline constexpr int32_t CRYPTO_MODE_AES_CTR     = 1;

inline constexpr int32_t CRYPTO_MODE_UNENCRYPTED = 0;

inline constexpr int32_t INFO_OUTPUT_BUFFERS_CHANGED = -3;

inline constexpr int32_t INFO_OUTPUT_FORMAT_CHANGED  = -2;

inline constexpr int32_t INFO_TRY_AGAIN_LATER        = -1;

inline constexpr int32_t VIDEO_SCALING_MODE_SCALE_TO_FIT               = 1;