diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-04-14 22:30:11 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-04-14 22:30:11 +0000 |
| commit | 899f38df62b0846a638ee7c0611de7f9fe33727f (patch) | |
| tree | 290d3f324eb4c911d154840d28a78b256a0962a4 | |
| parent | 34bcada42428a8206cfeaecf0b312e174289dec2 (diff) | |
| download | ffmpeg-899f38df62b0846a638ee7c0611de7f9fe33727f.tar.gz | |
Fix two icc warnings #188: enumerated type mixed with another type.
Originally committed as revision 18515 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavdevice/alsa-audio-common.c | 4 | ||||
| -rw-r--r-- | libavdevice/alsa-audio.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c index 98127249a6..f1d78b0cc5 100644 --- a/libavdevice/alsa-audio-common.c +++ b/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; diff --git a/libavdevice/alsa-audio.h b/libavdevice/alsa-audio.h index 2406e8dc19..a7fbb8d281 100644 --- a/libavdevice/alsa-audio.h +++ b/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. |