Commit 35824733 authored by hartman's avatar hartman

Merge branch 'df-for-upstream' of git://repo.or.cz/vlc/davidf-public

parents ec6ed81c 7ca75b8a
......@@ -488,6 +488,11 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
#endif
SetVideoFormat( p_dec );
ResetPTStlb( p_dec );
p_schroframe = CreateSchroFrameFromPic( p_dec );
if( p_schroframe ) {
schro_decoder_add_output_picture( p_sys->p_schro, p_schroframe);
}
}
if( b_bail )
......
......@@ -1628,6 +1628,7 @@ static void Ogg_ReadDiracHeader( logical_stream_t *p_stream,
static const struct {
uint32_t u_n /* numerator */, u_d /* denominator */;
} dirac_frate_tbl[] = { /* table 10.3 */
{1,1}, /* this first value is never used */
{24000,1001}, {24,1}, {25,1}, {30000,1001}, {30,1},
{50,1}, {60000,1001}, {60,1}, {15000,1001}, {25,2},
};
......
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