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

diff --git a/modules/codec/schroedinger.c b/modules/codec/schroedinger.c
index 960e53a6fc938cc58c0c1c47a4a3892dd32c7819..3fc1582b8a901c15a6f76bf71b2fc7012ee9c442 100644 (file)
--- a/modules/codec/schroedinger.c
+++ b/modules/codec/schroedinger.c
@@ -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 )

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index e3440d5f31197237ba749b6bae39c5421e22a13a..9b86a25fd9eb3adf8a6b48b3bf9289e0ef51ebef 100644 (file)
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -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},
     };