summaryrefslogtreecommitdiff
path: root/libavcodec/h264_sei.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-12-01 01:09:43 -0300
committerJames Almer <jamrial@gmail.com>2017-12-01 01:10:11 -0300
commit5e9b39b373215104dbcf59e161b3755466f18859 (patch)
tree3d75ccbe5cff7759f3829e58ed698ffe6a2e7244 /libavcodec/h264_sei.c
parent83ecdc9a920d7f0b69d1a25d63757adb887a1f25 (diff)
avcodec/h264_sei: remove redundant prefix to H264SEIFramePacking fields
Cosmetic change. Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264_sei.c')
-rw-r--r--libavcodec/h264_sei.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
index 27a37247b5..9defcb80b9 100644
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@ -313,12 +313,12 @@ static int decode_buffering_period(H264SEIBufferingPeriod *h, GetBitContext *gb,
static int decode_frame_packing_arrangement(H264SEIFramePacking *h,
GetBitContext *gb)
{
- h->frame_packing_arrangement_id = get_ue_golomb_long(gb);
- h->frame_packing_arrangement_cancel_flag = get_bits1(gb);
- h->present = !h->frame_packing_arrangement_cancel_flag;
+ h->arrangement_id = get_ue_golomb_long(gb);
+ h->arrangement_cancel_flag = get_bits1(gb);
+ h->present = !h->arrangement_cancel_flag;
if (h->present) {
- h->frame_packing_arrangement_type = get_bits(gb, 7);
+ h->arrangement_type = get_bits(gb, 7);
h->quincunx_sampling_flag = get_bits1(gb);
h->content_interpretation_type = get_bits(gb, 6);
@@ -328,10 +328,10 @@ static int decode_frame_packing_arrangement(H264SEIFramePacking *h,
// frame0_self_contained_flag, frame1_self_contained_flag
skip_bits(gb, 2);
- if (!h->quincunx_sampling_flag && h->frame_packing_arrangement_type != 5)
+ if (!h->quincunx_sampling_flag && h->arrangement_type != 5)
skip_bits(gb, 16); // frame[01]_grid_position_[xy]
skip_bits(gb, 8); // frame_packing_arrangement_reserved_byte
- h->frame_packing_arrangement_repetition_period = get_ue_golomb_long(gb);
+ h->arrangement_repetition_period = get_ue_golomb_long(gb);
}
skip_bits1(gb); // frame_packing_arrangement_extension_flag
@@ -465,8 +465,8 @@ int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb,
const char *ff_h264_sei_stereo_mode(const H264SEIFramePacking *h)
{
- if (h->frame_packing_arrangement_cancel_flag == 0) {
- switch (h->frame_packing_arrangement_type) {
+ if (h->arrangement_cancel_flag == 0) {
+ switch (h->arrangement_type) {
case H264_SEI_FPA_TYPE_CHECKERBOARD:
if (h->content_interpretation_type == 2)
return "checkerboard_rl";
@@ -501,7 +501,7 @@ const char *ff_h264_sei_stereo_mode(const H264SEIFramePacking *h)
default:
return "mono";
}
- } else if (h->frame_packing_arrangement_cancel_flag == 1) {
+ } else if (h->arrangement_cancel_flag == 1) {
return "mono";
} else {
return NULL;