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

[vlc] / include / vlc_codec.h

diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index 06aa6d669911ffbe3b38bafa6c8adc1031bde034..ffc33e7b6caaaea06873838168c1b2c457dbb814 100644 (file)
--- a/include/vlc_codec.h
+++ b/include/vlc_codec.h
@@ -21,10 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
 #ifndef _VLC_CODEC_H
 #define _VLC_CODEC_H 1
 
@@ -66,10 +62,10 @@ struct decoder_t
     es_format_t         fmt_out;
 
     /* Some decoders only accept packetized data (ie. not truncated) */
-    vlc_bool_t          b_need_packetized;
+    bool          b_need_packetized;
 
     /* Tell the decoder if it is allowed to drop frames */
-    vlc_bool_t          b_pace_control;
+    bool          b_pace_control;
 
     /* */
     picture_t *         ( * pf_decode_video )( decoder_t *, block_t ** );
@@ -83,7 +79,7 @@ struct decoder_t
      * last pf_packetize/pf_decode_video call only,
      * pb_present will be used to known which cc channel are present (but
      * globaly, not necessary for the current packet */
-    block_t *           ( * pf_get_cc )      ( decoder_t *, vlc_bool_t pb_present[4] );
+    block_t *           ( * pf_get_cc )      ( decoder_t *, bool pb_present[4] );
 
     /*
      * Buffers allocation