flv: Split FrameType and CodecID values

diff --git a/output/flv.c b/output/flv.c
index dfe4d484e28f95d188b2d561a27e674334d2ba38..0057de4bdba602e0424fedeb8fd9b02b9b43463b 100644 (file)
--- a/output/flv.c
+++ b/output/flv.c
@@ -196,7 +196,7 @@ static int write_headers( hnd_t handle, x264_nal_t *p_nal )
     flv_put_be24( c, 0 ); // StreamID - Always 0
     p_flv->start = c->d_cur; // needed for overwriting length
 
-    flv_put_byte( c, 7 | FLV_FRAME_KEY ); // Frametype and CodecID
+    flv_put_byte( c, FLV_FRAME_KEY | FLV_CODECID_H264 ); // FrameType and CodecID
     flv_put_byte( c, 0 ); // AVC sequence header
     flv_put_be24( c, 0 ); // composition time
 
@@ -279,7 +279,7 @@ static int write_frame( hnd_t handle, uint8_t *p_nalu, int i_size, x264_picture_
     flv_put_be24( c, 0 );
 
     p_flv->start = c->d_cur;
-    flv_put_byte( c, p_picture->b_keyframe ? FLV_FRAME_KEY : FLV_FRAME_INTER );
+    flv_put_byte( c, (p_picture->b_keyframe ? FLV_FRAME_KEY : FLV_FRAME_INTER) | FLV_CODECID_H264 );
     flv_put_byte( c, 1 ); // AVC NALU
     flv_put_be24( c, offset );
 

diff --git a/output/flv_bytestream.h b/output/flv_bytestream.h
index af22b09a6b22372bb25756da712ed7ef05a80b5e..91e18ff49cac7073e59928d691d600267984d986 100644 (file)
--- a/output/flv_bytestream.h
+++ b/output/flv_bytestream.h
@@ -90,8 +90,8 @@ enum
 
 enum
 {
-    FLV_FRAME_KEY   = 1 << FLV_VIDEO_FRAMETYPE_OFFSET | 7,
-    FLV_FRAME_INTER = 2 << FLV_VIDEO_FRAMETYPE_OFFSET | 7,
+    FLV_FRAME_KEY   = 1 << FLV_VIDEO_FRAMETYPE_OFFSET,
+    FLV_FRAME_INTER = 2 << FLV_VIDEO_FRAMETYPE_OFFSET,
 };
 
 typedef enum