Commit 899f38df authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

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

Originally committed as revision 18515 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 34bcada4
...@@ -43,9 +43,9 @@ static av_cold snd_pcm_format_t codec_id_to_pcm_format(int codec_id) ...@@ -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, unsigned int *sample_rate,
int channels, int *codec_id) int channels, enum CodecID *codec_id)
{ {
AlsaData *s = ctx->priv_data; AlsaData *s = ctx->priv_data;
const char *audio_device; const char *audio_device;
......
...@@ -63,8 +63,8 @@ typedef struct { ...@@ -63,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 ff_alsa_open(AVFormatContext *s, snd_pcm_stream_t mode, unsigned int *sample_rate,
int channels, int *codec_id); int channels, enum CodecID *codec_id);
/** /**
* Closes the ALSA PCM. * Closes the ALSA PCM.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment