libhb: rename some masks to better reflect their purpose.

diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index ea0cad60d2be41597f5cabae52ee7f9e8dec3160..3f66b83d4581e3ab7704cc7ecf9580f452c3fb3b 100644 (file)
--- 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 7420466801ad2bfd6a9623aef46a1b038ff4b77b..c189591b4f91758f5d0a92cc58e1877d87925252 100644 (file)
--- 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 7b8bec67a6157e79c75712932ac2e6d58d0cddfa..abdee80b5bab5869ca7d5905573acb85f099df2f 100644 (file)
--- 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;
     }