Browse Source

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

Originally committed as revision 18515 to svn://svn.ffmpeg.org/ffmpeg/trunk
Carl Eugen Hoyos 16 years ago
parent
commit
899f38df62
2 changed files with 4 additions and 4 deletions
  1. 2 2
      libavdevice/alsa-audio-common.c
  2. 2 2
      libavdevice/alsa-audio.h

+ 2 - 2
libavdevice/alsa-audio-common.c

@@ -43,9 +43,9 @@ static av_cold snd_pcm_format_t codec_id_to_pcm_format(int codec_id)
     }
 }
 
-av_cold int ff_alsa_open(AVFormatContext *ctx, int mode,
+av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode,
                          unsigned int *sample_rate,
-                         int channels, int *codec_id)
+                         int channels, enum CodecID *codec_id)
 {
     AlsaData *s = ctx->priv_data;
     const char *audio_device;

+ 2 - 2
libavdevice/alsa-audio.h

@@ -63,8 +63,8 @@ typedef struct {
  *
  * @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.