| commit | b03e17e4b9e44864aff643e06b989b0e90fe5937 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Mar 09 22:02:59 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 22:02:59 2022 +0000 |
| tree | 3526d429eaca2a6d48a496c5fb65a7420fb7c867 | |
| parent | 4ac3e1312560228e821e014b77096ce8a22fc939 [diff] | |
| parent | 3f4c097d558f12edd73c17b2ba07d68a15225b1b [diff] |
Merge "Fix constant name for KEY_PICTURE_TYPE" am: 3f4c097d55 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2016888 Change-Id: I7faf7be33364a7b6c2a123cf6e6119b3e4773261
diff --git a/media/libstagefright/include/media/stagefright/MediaCodecConstants.h b/media/libstagefright/include/media/stagefright/MediaCodecConstants.h index fa9dc8b..9040e8b 100644 --- a/media/libstagefright/include/media/stagefright/MediaCodecConstants.h +++ b/media/libstagefright/include/media/stagefright/MediaCodecConstants.h
@@ -815,7 +815,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";