revert 24090 and add fix for including sps/pps in every keyframe without

breaking ts/h264 writing, so it waits until sps/pps are received before
handing stuff onward (as it did earlier). thanks to jpsaman for spotting
this.

diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index 132e3c371918e80a69e26e4f3f1a66d82dc93c91..0cd1f3a9704892d38dc85029ee82549d7ba32fa5 100644 (file)
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -532,6 +532,9 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag )
 
 #define OUTPUT \
     do {                                                      \
+        if( !p_sys->b_header && p_sys->slice.i_frame_type != BLOCK_FLAG_TYPE_I) \
+            break;                                            \
+                                                              \
         if( p_sys->slice.i_frame_type == BLOCK_FLAG_TYPE_I && p_sys->p_sps && p_sys->p_pps ) \
         { \
             block_t *p_sps = block_Duplicate( p_sys->p_sps ); \