From 0b16fbf384d253ba6e76e524e7d334bba2f93270 Mon Sep 17 00:00:00 2001 From: Tim Walker Date: Sat, 17 Sep 2016 14:47:26 +0200 Subject: [PATCH] libhb: rename some masks to better reflect their purpose. --- libhb/decavcodec.c | 2 +- libhb/internal.h | 4 ++-- libhb/muxavformat.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c index ea0cad60d..3f66b83d4 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -1014,7 +1014,7 @@ static int decodeFrame( hb_work_object_t *w, packet_info_t * packet_info ) // libav avcodec_decode_video2() needs AVPacket flagged with // AV_PKT_FLAG_KEY for some codecs. For example, sequence of // PNG in a mov container. - if (packet_info->frametype & HB_FRAME_KEY) + if (packet_info->frametype & HB_FRAME_MASK_KEY) { avp.flags |= AV_PKT_FLAG_KEY; } diff --git a/libhb/internal.h b/libhb/internal.h index 742046680..c189591b4 100644 --- a/libhb/internal.h +++ b/libhb/internal.h @@ -79,8 +79,8 @@ struct hb_buffer_settings_s #define HB_FRAME_P 0x10 #define HB_FRAME_B 0x20 #define HB_FRAME_BREF 0x40 -#define HB_FRAME_KEY 0x0F -#define HB_FRAME_REF 0xF0 +#define HB_FRAME_MASK_KEY 0x0F +#define HB_FRAME_MASK_REF 0xF0 uint8_t frametype; // Picture flags used by filters diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c index 7b8bec67a..abdee80b5 100644 --- a/libhb/muxavformat.c +++ b/libhb/muxavformat.c @@ -1169,7 +1169,7 @@ static int avformatMux(hb_mux_object_t *m, hb_mux_data_t *track, hb_buffer_t *bu pkt.flags |= AV_PKT_FLAG_KEY; } } - else if (buf->s.frametype & HB_FRAME_KEY) + else if (buf->s.frametype & HB_FRAME_MASK_KEY) { pkt.flags |= AV_PKT_FLAG_KEY; } -- 2.40.0