[vlc-commits] vlc_block: remove BLOCK_FLAG_NO_KEYFRAME

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Apr 12 17:07:42 2017 +0200| [c65a4d24a9bf706c6056c7f89d5c7cb61137a8d2] | committer: Francois Cartegnie

vlc_block: remove BLOCK_FLAG_NO_KEYFRAME

only used internally by ts muxer

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c65a4d24a9bf706c6056c7f89d5c7cb61137a8d2
---

 include/vlc_block.h   | 2 --
 modules/mux/mpeg/ts.c | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vlc_block.h b/include/vlc_block.h
index 79cb8510dd..9b9aa14a57 100644
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -77,8 +77,6 @@
 #define BLOCK_FLAG_HEADER        0x0020
 /** This is the last block of the frame */
 #define BLOCK_FLAG_END_OF_FRAME  0x0040
-/** This is not a key frame for bitrate shaping */
-#define BLOCK_FLAG_NO_KEYFRAME   0x0080
 /** This block contains the last part of a sequence  */
 #define BLOCK_FLAG_END_OF_SEQUENCE 0x0100
 /** This block contains a clock reference */
diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 30c8079d5b..79bde06c40 100644
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -192,6 +192,8 @@ static const char *const ts_standards_list_text[] =
   #error "MAX_SDT_DESC < MAX_PMT"
 #endif
 
+#define BLOCK_FLAG_NO_KEYFRAME (1 << BLOCK_FLAG_PRIVATE_SHIFT) /* This is not a key frame for bitrate shaping */
+
 vlc_module_begin ()
     set_description( N_("TS muxer (libdvbpsi)") )
     set_shortname( "MPEG-TS")