diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-11-25 12:51:57 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-11-25 13:19:54 +0000 |
| commit | cc276c85d15272df6e44fb3252657a43cbd49555 (patch) | |
| tree | baed10d2966866ed98d9887cd437cc43e009329f /libavdevice | |
| parent | 00a856e3f95214c54a878b7cbd6e8ae8c5ce3ca9 (diff) | |
Make channel layout masks unsigned
It makes more sense for a bit mask to use an unsigned type.
The change should be source and binary compatible on all
supported systems, hence micro version bump.
Fixes a few invalid shifts.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/alsa-audio-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c index a0662f6d8e..cfee28c516 100644 --- a/libavdevice/alsa-audio-common.c +++ b/libavdevice/alsa-audio-common.c @@ -143,7 +143,7 @@ switch(format) {\ case FORMAT_F32: s->reorder_func = alsa_reorder_f32_out_ ##layout; break;\ } -static av_cold int find_reorder_func(AlsaData *s, int codec_id, int64_t layout, int out) +static av_cold int find_reorder_func(AlsaData *s, int codec_id, uint64_t layout, int out) { int format; @@ -194,7 +194,7 @@ av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode, snd_pcm_t *h; snd_pcm_hw_params_t *hw_params; snd_pcm_uframes_t buffer_size, period_size; - int64_t layout = ctx->streams[0]->codec->channel_layout; + uint64_t layout = ctx->streams[0]->codec->channel_layout; if (ctx->filename[0] == 0) audio_device = "default"; else audio_device = ctx->filename; |