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

Commit 89aac12c authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Fix heif related MediaFormat key names in ndk" into pi-dev

am: f8245c13

Change-Id: I71586e0ae6dd59ab8314380df9a473fd91b6d268
parents 9a8d2264 f8245c13
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -49,10 +49,8 @@ LIBMEDIANDK {
    AMEDIAFORMAT_KEY_DURATION; # var
    AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL; # var
    AMEDIAFORMAT_KEY_FRAME_RATE; # var
    AMEDIAFORMAT_KEY_GRID_COLS; # var introduced=28
    AMEDIAFORMAT_KEY_GRID_HEIGHT; # var introduced=28
    AMEDIAFORMAT_KEY_GRID_COLUMNS; # var introduced=28
    AMEDIAFORMAT_KEY_GRID_ROWS; # var introduced=28
    AMEDIAFORMAT_KEY_GRID_WIDTH; # var introduced=28
    AMEDIAFORMAT_KEY_HDR_STATIC_INFO; # var introduced=28
    AMEDIAFORMAT_KEY_HEIGHT; # var
    AMEDIAFORMAT_KEY_INTRA_REFRESH_PERIOD; # var introduced=28
@@ -79,6 +77,8 @@ LIBMEDIANDK {
    AMEDIAFORMAT_KEY_SLICE_HEIGHT; # var introduced=28
    AMEDIAFORMAT_KEY_STRIDE; # var
    AMEDIAFORMAT_KEY_TEMPORAL_LAYERING; # var introduced=28
    AMEDIAFORMAT_KEY_TILE_HEIGHT; # var introduced=28
    AMEDIAFORMAT_KEY_TILE_WIDTH; # var introduced=28
    AMEDIAFORMAT_KEY_TRACK_ID; # var introduced=28
    AMEDIAFORMAT_KEY_WIDTH; # var
    AMediaCodecActionCode_isRecoverable; # introduced=28