summaryrefslogtreecommitdiff
path: root/libavcodec/audioconvert.h
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-11-25 12:51:57 +0000
committerMans Rullgard <mans@mansr.com>2011-11-25 13:19:54 +0000
commitcc276c85d15272df6e44fb3252657a43cbd49555 (patch)
treebaed10d2966866ed98d9887cd437cc43e009329f /libavcodec/audioconvert.h
parent00a856e3f95214c54a878b7cbd6e8ae8c5ce3ca9 (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 'libavcodec/audioconvert.h')
-rw-r--r--libavcodec/audioconvert.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
index e9a78fe495..f50eb3e1bb 100644
--- a/libavcodec/audioconvert.h
+++ b/libavcodec/audioconvert.h
@@ -80,7 +80,7 @@ int avcodec_channel_layout_num_channels(int64_t channel_layout);
* @param fmt_name Format name, or NULL if unknown
* @return Channel layout mask
*/
-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);
struct AVAudioConvert;
typedef struct AVAudioConvert AVAudioConvert;