Rename aout_instance_t to audio_output_t

[vlc] / src / input / decoder.h

diff --git a/src/input/decoder.h b/src/input/decoder.h
index b113d22fcde4bea0370643a223e6eab478564d4d..6f2dcb26c38541e3559b2d467134994bd6e675f0 100644 (file)
--- a/src/input/decoder.h
+++ b/src/input/decoder.h
@@ -22,18 +22,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
-# error This header file can only be included from LibVLC.
-#endif
-
-#ifndef _INPUT_DECODER_H
-#define _INPUT_DECODER_H 1
+#ifndef LIBVLC_INPUT_DECODER_H
+#define LIBVLC_INPUT_DECODER_H 1
 
 #include <vlc_common.h>
 #include <vlc_codec.h>
 
 #define BLOCK_FLAG_CORE_FLUSH (1 <<BLOCK_FLAG_CORE_PRIVATE_SHIFT)
 
+decoder_t *input_DecoderNew( input_thread_t *, es_format_t *, input_clock_t *,
+                             sout_instance_t * ) VLC_USED;
+
 /**
  * This function changes the pause state.
  * The date parameter MUST hold the exact date at wich the change has been
@@ -109,6 +108,6 @@ size_t input_DecoderGetFifoSize( decoder_t *p_dec );
  *
  * They must be released using vlc_object_release().
  */
-void input_DecoderGetObjects( decoder_t *, vout_thread_t **, aout_instance_t ** );
+void input_DecoderGetObjects( decoder_t *, vout_thread_t **, audio_output_t ** );
 
 #endif