* modules/codec/ffmpeg/video.[ch]: another temporary workaround.

[vlc] / modules / codec / ffmpeg / video.h

diff --git a/modules/codec/ffmpeg/video.h b/modules/codec/ffmpeg/video.h
index bd1bdbcfd77ba0dc648a01fbf20f5139e92e572f..8124682ae276c1273829ecd02bc1cada59c01304 100644 (file)
--- a/modules/codec/ffmpeg/video.h
+++ b/modules/codec/ffmpeg/video.h
@@ -2,7 +2,7 @@
  * video.h: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: video.h,v 1.2 2002/11/05 10:07:56 gbazin Exp $
+ * $Id: video.h,v 1.11 2003/08/12 17:01:35 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -10,7 +10,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -25,23 +25,29 @@ typedef struct vdec_thread_s
 {
     DECODER_THREAD_COMMON
 
+    AVFrame        *p_ff_pic;
     BITMAPINFOHEADER    *p_format;
 
-    vout_thread_t       *p_vout; 
+    vout_thread_t       *p_vout;
 
     /* for post processing */
-    u32                 i_pp_mode; /* valid only with I420 and YV12 */
-    postprocessing_t    *p_pp;
+#ifdef LIBAVCODEC_PP
+    pp_context_t        *pp_context;
+    pp_mode_t           *pp_mode;
+#endif
 
     /* for frame skipping algo */
     int b_hurry_up;
     int i_frame_error;
     int i_frame_skip;
-    int i_frame_late;  /* how many decoded frames are late */
+
+    vlc_bool_t b_has_b_frames;
+
+    int     i_frame_late;   /* how many decoded frames are late */
+    mtime_t i_frame_late_start;
 
     /* for direct rendering */
     int b_direct_rendering;
-
 } vdec_thread_t;