[FFmpeg-cvslog] r18515 - in trunk/libavdevice: alsa-audio-common.c alsa-audio.h

[cehoyos]

Author: cehoyos
Date: Wed Apr 15 00:30:11 2009
New Revision: 18515

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

Modified:
   trunk/libavdevice/alsa-audio-common.c
   trunk/libavdevice/alsa-audio.h

Modified: trunk/libavdevice/alsa-audio-common.c
==============================================================================
--- trunk/libavdevice/alsa-audio-common.c	Wed Apr 15 00:21:53 2009	(r18514)
+++ trunk/libavdevice/alsa-audio-common.c	Wed Apr 15 00:30:11 2009	(r18515)
@@ -43,9 +43,9 @@ static av_cold snd_pcm_format_t 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;

Modified: trunk/libavdevice/alsa-audio.h
==============================================================================
--- trunk/libavdevice/alsa-audio.h	Wed Apr 15 00:21:53 2009	(r18514)
+++ trunk/libavdevice/alsa-audio.h	Wed Apr 15 00:30:11 2009	(r18515)
@@ -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.