Removed some dead wood.

[vlc] / include / vlc_codec.h

diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index 180538a09b9094c56e0a59993c1d17da7f030e26..c0b7617aa957cc25ca355d99e25f59d5da9691a6 100644 (file)
--- a/include/vlc_codec.h
+++ b/include/vlc_codec.h
@@ -2,7 +2,7 @@
  * vlc_codec.h: codec related structures
  *****************************************************************************
  * Copyright (C) 1999-2003 VideoLAN
- * $Id: vlc_codec.h,v 1.4 2003/11/16 21:07:30 gbazin Exp $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -48,17 +48,14 @@ struct decoder_t
     module_t *          p_module;
     decoder_sys_t *     p_sys;
 
-    /* Deprecated */
-    int                 ( * pf_decode )( decoder_t *, block_t * );
-    decoder_fifo_t *    p_fifo;
-    int                 ( * pf_run ) ( decoder_fifo_t * );
-    /* End deprecated */
-
     picture_t *         ( * pf_decode_video )( decoder_t *, block_t ** );
     aout_buffer_t *     ( * pf_decode_audio )( decoder_t *, block_t ** );
     void                ( * pf_decode_sub)   ( decoder_t *, block_t ** );
     block_t *           ( * pf_packetize )   ( decoder_t *, block_t ** );
 
+    /* Some decoders only accept packetized data (ie. not truncated) */
+    vlc_bool_t          b_need_packetized;
+
     /* Input format ie from demuxer (XXX: a lot of field could be invalid) */
     es_format_t         fmt_in;
 
@@ -76,6 +73,8 @@ struct decoder_t
     /* Video output callbacks */
     picture_t     * ( * pf_vout_buffer_new) ( decoder_t * );
     void            ( * pf_vout_buffer_del) ( decoder_t *, picture_t * );
+    void            ( * pf_picture_link)    ( decoder_t *, picture_t * );
+    void            ( * pf_picture_unlink)  ( decoder_t *, picture_t * );
 
 
     /* Private structure for the owner of the decoder */
@@ -119,7 +118,17 @@ struct encoder_t
     int i_qmin;
     int i_qmax;
     int i_hq;
-
+    vlc_bool_t          b_strict_rc;
+    vlc_bool_t          b_pre_me;
+    vlc_bool_t          b_hurry_up;
+    vlc_bool_t          b_interlace;
+    int                 i_rc_buffer_size;
+    float               f_rc_buffer_aggressivity;
+    float               f_i_quant_factor;
+    int                 i_noise_reduction;
+    vlc_bool_t          b_mpeg4_matrix;
+    int                 i_threads;
+    vlc_bool_t          b_trellis;
 };
 
 /**