[FFmpeg-devel] [PATCH 3/4] lavc/h264: rename GreenMetaData to H264SEIGreenMetaData

[Clément Bœsch]

Reduces diff for the next merge with Libav.
---
 libavcodec/h264.c     | 2 +-
 libavcodec/h264.h     | 6 +++---
 libavcodec/h264_sei.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 46eaec2..795e599 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -959,7 +959,7 @@ static int get_last_needed_nal(H264Context *h)
     return nals_needed;
 }
 
-static void debug_green_metadata(const GreenMetaData *gm, void *logctx)
+static void debug_green_metadata(const H264SEIGreenMetaData *gm, void *logctx)
 {
     av_log(logctx, AV_LOG_DEBUG, "Green Metadata Info SEI message\n");
     av_log(logctx, AV_LOG_DEBUG, "  green_metadata_type: %d\n", gm->green_metadata_type);
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index da8a92f..8c7a537 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -295,7 +295,7 @@ typedef struct FPA {
 /**
  *     Green MetaData Information Type
  */
-typedef struct GreenMetaData {
+typedef struct H264SEIGreenMetaData {
     uint8_t  green_metadata_type;
     uint8_t  period_type;
     uint16_t  num_seconds;
@@ -306,7 +306,7 @@ typedef struct GreenMetaData {
     uint8_t percent_alpha_point_deblocking_instance;
     uint8_t xsd_metric_type;
     uint16_t xsd_metric_value;
-} GreenMetaData;
+} H264SEIGreenMetaData;
 
 /**
  * Memory management control operation opcode.
@@ -831,7 +831,7 @@ typedef struct H264Context {
     qpel_mc_func (*qpel_avg)[16];
 
     /*Green Metadata */
-    GreenMetaData sei_green_metadata;
+    H264SEIGreenMetaData sei_green_metadata;
 
 } H264Context;
 
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
index 46d1814..ab98c27 100644
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@ -363,7 +363,7 @@ static int decode_display_orientation(H264Context *h)
     return 0;
 }
 
-static int decode_GreenMetadata(GreenMetaData *h, GetBitContext *gb)
+static int decode_GreenMetadata(H264SEIGreenMetaData *h, GetBitContext *gb)
 {
     h->green_metadata_type=get_bits(gb, 8);
 
-- 
2.8.3