| commit | e672c849001de656f481693c7022aa02a76c0bed | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Mar 09 22:27:02 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 22:27:02 2022 +0000 |
| tree | e17e52a705386e9c71eb790bedb78ded14316d50 | |
| parent | 8fa9df8c9a946e00ec87bd7c3e151bd68859c585 [diff] | |
| parent | b03e17e4b9e44864aff643e06b989b0e90fe5937 [diff] |
Merge "Fix constant name for KEY_PICTURE_TYPE" am: 3f4c097d55 am: b03e17e4b9 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2016888 Change-Id: I9885535cfa516c737919b30300274f4fa67a6962
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";