diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-13 22:56:16 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-14 08:23:23 +0200 |
| commit | 5342bb624dd9a91ec04d5afd43aeff8502891b62 (patch) | |
| tree | d7e1e28da6088d839246e6e4da6d0aa966e43105 | |
| parent | b0ec36c9b168af131621cbde3e5ab9d9efd5337c (diff) | |
lavc/h264: rename GreenMetaData to H264SEIGreenMetaData
Reduces diff for the next merge with Libav.
| -rw-r--r-- | libavcodec/h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264.h | 6 | ||||
| -rw-r--r-- | libavcodec/h264_sei.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 46eaec2ab0..795e5999cf 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 da8a92f47e..8c7a537dfb 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 46d1814e15..ab98c2737c 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); |