Do not feed video frames to the vout

modules/codec/davinci/viddec.c

@@ -5,6 +5,7 @@
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea at videolan dot org>
+ *          Rafaël Carré <rcarre@m2x.nl>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -498,6 +499,7 @@ static picture_t *DecodeVideoBlockInner( decoder_t *p_dec, block_t **pp_block, i
     p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * status.outputWidth
                                     / status.outputHeight; /* FIXME */
 
+#ifndef DAVINCI_HACK
     /* Get a new picture */
     picture_t *p_pic = p_dec->pf_vout_buffer_new( p_dec );
     if( !p_pic )
@@ -507,8 +509,7 @@ static picture_t *DecodeVideoBlockInner( decoder_t *p_dec, block_t **pp_block, i
     }
     p_pic->b_progressive = status.contentType == IVIDEO_INTERLACED ? VLC_FALSE
                                                                    : VLC_TRUE;
-
-    /* Copy stuff to picture here */
+#endif
 #ifdef DEBUG_DAVINCI
     switch( out_args.decodedFrameType )
     {
@@ -539,6 +540,8 @@ static picture_t *DecodeVideoBlockInner( decoder_t *p_dec, block_t **pp_block, i
     }
 #endif
 
+#ifndef DAVINCI_HACK
+    /* Copy stuff to picture here */
     assert( p_pic->i_planes == p_sys->out.numBufs );
 
     for( i = 0; i < p_pic->i_planes; i++ )
@@ -555,7 +558,7 @@ static picture_t *DecodeVideoBlockInner( decoder_t *p_dec, block_t **pp_block, i
         *pp_block = NULL;
     }
 
-#ifdef DAVINCI_HACK
+#else
     if( !p_sys->b_resizer_init )
     {
         rsz_params_t rsz_params;
@@ -624,12 +627,17 @@ static picture_t *DecodeVideoBlockInner( decoder_t *p_dec, block_t **pp_block, i
     ioctl( p_sys->i_fd_fb, FBIO_WAITFORVSYNC, &i_dummy ); /* ignore return */
 #endif
 
+#ifndef DAVINCI_HACK
     return p_pic;
+#else
+    return NULL; /* Do not feed the video output */
+#endif
 
 error:
+#ifndef DAVINCI_HACK
     if( p_pic && p_pic->pf_release )
         p_pic->pf_release( p_pic );
-
+#endif
     /* Do we really need this everytime? (like if buffer memory allocation fails we could keep the block) */
     block_Release( p_block );
     return NULL;