summaryrefslogtreecommitdiff
path: root/libavutil/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 /libavutil/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 'libavutil/audioconvert.h')
-rw-r--r--libavutil/audioconvert.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h
index 1c5cfa0a8e..54b13b2bea 100644
--- a/libavutil/audioconvert.h
+++ b/libavutil/audioconvert.h
@@ -62,7 +62,7 @@
/** Channel mask value used for AVCodecContext.request_channel_layout
to indicate that the user requests the channel order of the decoder output
to be the native codec channel order. */
-#define AV_CH_LAYOUT_NATIVE 0x8000000000000000LL
+#define AV_CH_LAYOUT_NATIVE 0x8000000000000000ULL
/**
* @}
@@ -92,7 +92,7 @@
/**
* Return a channel layout id that matches name, 0 if no match.
*/
-int64_t av_get_channel_layout(const char *name);
+uint64_t av_get_channel_layout(const char *name);
/**
* Return a description of a channel layout.
@@ -101,12 +101,12 @@ int64_t av_get_channel_layout(const char *name);
* @param buf put here the string containing the channel layout
* @param buf_size size in bytes of the buffer
*/
-void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout);
+void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
/**
* Return the number of channels in the channel layout.
*/
-int av_get_channel_layout_nb_channels(int64_t channel_layout);
+int av_get_channel_layout_nb_channels(uint64_t channel_layout);
/**
* @}