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

Commit e69bfaf7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix constant name for KEY_PICTURE_TYPE" am: 3f4c097d am: b03e17e4... 

Merge "Fix constant name for KEY_PICTURE_TYPE" am: 3f4c097d am: b03e17e4 am: e672c849 am: b0ec81c7

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

Change-Id: I89d09199cad50832df37d689ba36cf6b703b5e32
parents 8843ce55 b0ec81c7

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

+1 −1
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ constexpr char KEY_MIME[] = "mime"; 
constexpr char KEY_OPERATING_RATE[] = "operating-rate";

constexpr char KEY_OUTPUT_REORDER_DEPTH[] = "output-reorder-depth";

constexpr char KEY_PCM_ENCODING[] = "pcm-encoding";

constexpr char KEY_PICTURE_TYPE[] = "picture_type";

constexpr char KEY_PICTURE_TYPE[] = "picture-type";

constexpr char KEY_PIXEL_ASPECT_RATIO_HEIGHT[] = "sar-height";

constexpr char KEY_PIXEL_ASPECT_RATIO_WIDTH[] = "sar-width";

constexpr char KEY_PREPEND_HEADER_TO_SYNC_FRAMES[] = "prepend-sps-pps-to-idr-frames";