Fix two icc warnings #188: enumerated type mixed with another type.

[ffmpeg.git] / libavdevice / alsa-audio.h

diff --git a/libavdevice/alsa-audio.h b/libavdevice/alsa-audio.h
index 91c9560..a7fbb8d 100644 (file)
--- a/libavdevice/alsa-audio.h
+++ b/libavdevice/alsa-audio.h
@@ -30,6 +30,10 @@
 #ifndef AVDEVICE_ALSA_AUDIO_H
 #define AVDEVICE_ALSA_AUDIO_H
 
 #ifndef AVDEVICE_ALSA_AUDIO_H
 #define AVDEVICE_ALSA_AUDIO_H
 

+#include <alsa/asoundlib.h>
+#include "config.h"
+#include "libavformat/avformat.h"
+

 /* XXX: we make the assumption that the soundcard accepts this format */
 /* XXX: find better solution with "preinit" method, needed also in
         other formats */
 /* XXX: we make the assumption that the soundcard accepts this format */
 /* XXX: find better solution with "preinit" method, needed also in
         other formats */


@@ -59,8 +63,8 @@ typedef struct {
  *
  * @return 0 if OK, AVERROR_xxx on error
  */
  *
  * @return 0 if OK, AVERROR_xxx on error
  */

-int ff_alsa_open(AVFormatContext *s, int mode, unsigned int *sample_rate,
-                 int channels, int *codec_id);
+int ff_alsa_open(AVFormatContext *s, snd_pcm_stream_t mode, unsigned int *sample_rate,
+                 int channels, enum CodecID *codec_id);

 
 /**
  * Closes the ALSA PCM.
 
 /**
  * Closes the ALSA PCM.