Commit 0669b648 authored by Ilkka Ollakka's avatar Ilkka Ollakka

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.
parent 56a8c2a5
...@@ -532,6 +532,9 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) ...@@ -532,6 +532,9 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag )
#define OUTPUT \ #define OUTPUT \
do { \ 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 ) \ 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 ); \ block_t *p_sps = block_Duplicate( p_sys->p_sps ); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment