| commit | b0ec81c725a8ef32fbc24906b120c359b9f4db7f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Mar 09 22:52:07 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 22:52:07 2022 +0000 |
| tree | 58493754f40af288479bd35ca4c4b2b3cf4fb92f | |
| parent | 73fe3dc8c715637f10f026cb9da289fa450c4dcf [diff] | |
| parent | e672c849001de656f481693c7022aa02a76c0bed [diff] |
Merge "Fix constant name for KEY_PICTURE_TYPE" am: 3f4c097d55 am: b03e17e4b9 am: e672c84900 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2016888 Change-Id: I3ee614bf1af8147216ac8fa606b48de4f923ff23
diff --git a/media/libstagefright/include/media/stagefright/MediaCodecConstants.h b/media/libstagefright/include/media/stagefright/MediaCodecConstants.h index 84653eb..78792c5 100644 --- a/media/libstagefright/include/media/stagefright/MediaCodecConstants.h +++ b/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
@@ -816,7 +816,7 @@ 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";