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 /libavcodec/audioconvert.c | |
| parent | 00a856e3f95214c54a878b7cbd6e8ae8c5ce3ca9 (diff) | |
| download | ffmpeg-cc276c85d15272df6e44fb3252657a43cbd49555.tar.gz | |
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 'libavcodec/audioconvert.c')
| -rw-r--r-- | libavcodec/audioconvert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c index 4bea30848f..a24434547e 100644 --- a/libavcodec/audioconvert.c +++ b/libavcodec/audioconvert.c @@ -48,7 +48,7 @@ void avcodec_sample_fmt_string (char *buf, int buf_size, int sample_fmt) } #endif -int64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name) +uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name) { switch(nb_channels) { case 1: return AV_CH_LAYOUT_MONO; |