diff options
| author | Mark Thompson <sw@jkqxz.net> | 2017-05-15 22:42:14 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2017-09-12 22:29:31 +0100 |
| commit | 6eb102a616364d06a4cc994339b72910b3547e5f (patch) | |
| tree | bb43d9a574e95d8a51a5890da5326b4a3d3051de /libavcodec/h264_sei.c | |
| parent | 1db03e952b4ee998f2a19c037f60d17dc90e8f6c (diff) | |
h264_sei: Add namespace prefix to all SEI values
This avoids confusion with equivalent H.265 SEI values when both are
being used at the same time.
(cherry picked from commit 6ea220cbeec8863e2006a03b73bed52db2b13ee7)
Diffstat (limited to 'libavcodec/h264_sei.c')
| -rw-r--r-- | libavcodec/h264_sei.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 889bea2ee0..2afe48e2fe 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -81,7 +81,7 @@ static int decode_picture_timing(H264SEIPictureTiming *h, GetBitContext *gb, h->pic_struct = get_bits(gb, 4); h->ct_type = 0; - if (h->pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING) + if (h->pic_struct > H264_SEI_PIC_STRUCT_FRAME_TRIPLING) return AVERROR_INVALIDDATA; num_clock_ts = sei_num_clock_ts_table[h->pic_struct]; @@ -421,31 +421,31 @@ int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb, next = get_bits_count(gb) + 8 * size; switch (type) { - case SEI_TYPE_PIC_TIMING: // Picture timing SEI + case H264_SEI_TYPE_PIC_TIMING: // Picture timing SEI ret = decode_picture_timing(&h->picture_timing, gb, ps, logctx); break; - case SEI_TYPE_USER_DATA_REGISTERED: + case H264_SEI_TYPE_USER_DATA_REGISTERED: ret = decode_registered_user_data(h, gb, logctx, size); break; - case SEI_TYPE_USER_DATA_UNREGISTERED: + case H264_SEI_TYPE_USER_DATA_UNREGISTERED: ret = decode_unregistered_user_data(&h->unregistered, gb, logctx, size); break; - case SEI_TYPE_RECOVERY_POINT: + case H264_SEI_TYPE_RECOVERY_POINT: ret = decode_recovery_point(&h->recovery_point, gb); break; - case SEI_TYPE_BUFFERING_PERIOD: + case H264_SEI_TYPE_BUFFERING_PERIOD: ret = decode_buffering_period(&h->buffering_period, gb, ps, logctx); break; - case SEI_TYPE_FRAME_PACKING: + case H264_SEI_TYPE_FRAME_PACKING: ret = decode_frame_packing_arrangement(&h->frame_packing, gb); break; - case SEI_TYPE_DISPLAY_ORIENTATION: + case H264_SEI_TYPE_DISPLAY_ORIENTATION: ret = decode_display_orientation(&h->display_orientation, gb); break; - case SEI_TYPE_GREEN_METADATA: + case H264_SEI_TYPE_GREEN_METADATA: ret = decode_green_metadata(&h->green_metadata, gb); break; - case SEI_TYPE_ALTERNATIVE_TRANSFER: + case H264_SEI_TYPE_ALTERNATIVE_TRANSFER: ret = decode_alternative_transfer(&h->alternative_transfer, gb); break; default: |