From cc276c85d15272df6e44fb3252657a43cbd49555 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 25 Nov 2011 12:51:57 +0000 Subject: 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 --- libavfilter/asrc_anullsrc.c | 2 +- libavfilter/avfilter.c | 2 +- libavfilter/avfilter.h | 14 +++++++------- libavfilter/defaults.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c index dd671c5d53..8e99012faf 100644 --- a/libavfilter/asrc_anullsrc.c +++ b/libavfilter/asrc_anullsrc.c @@ -25,7 +25,7 @@ #include "libavutil/audioconvert.h" typedef struct { - int64_t channel_layout; + uint64_t channel_layout; int64_t sample_rate; } ANullContext; diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 2f24aa3d98..b0304d64d5 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -349,7 +349,7 @@ fail: AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, int perms, enum AVSampleFormat sample_fmt, int size, - int64_t channel_layout, int planar) + uint64_t channel_layout, int planar) { AVFilterBufferRef *ret = NULL; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index f83c861f4b..c40d9f4d04 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MINOR 13 -#define LIBAVFILTER_VERSION_MICRO 0 +#define LIBAVFILTER_VERSION_MICRO 1 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ @@ -100,7 +100,7 @@ typedef struct AVFilterBuffer { * per reference properties must be separated out. */ typedef struct AVFilterBufferRefAudioProps { - int64_t channel_layout; ///< channel layout of audio buffer + uint64_t channel_layout; ///< channel layout of audio buffer int nb_samples; ///< number of audio samples int size; ///< audio buffer size uint32_t sample_rate; ///< audio buffer sample rate @@ -376,7 +376,7 @@ struct AVFilterPad { */ AVFilterBufferRef *(*get_audio_buffer)(AVFilterLink *link, int perms, enum AVSampleFormat sample_fmt, int size, - int64_t channel_layout, int planar); + uint64_t channel_layout, int planar); /** * Callback called after the slices of a frame are completely sent. If @@ -465,7 +465,7 @@ AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, /** default handler for get_audio_buffer() for audio inputs */ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int perms, enum AVSampleFormat sample_fmt, int size, - int64_t channel_layout, int planar); + uint64_t channel_layout, int planar); /** * A helper for query_formats() which sets all links to the same list of @@ -496,7 +496,7 @@ AVFilterBufferRef *avfilter_null_get_video_buffer(AVFilterLink *link, /** get_audio_buffer() handler for filters which simply pass audio along */ AVFilterBufferRef *avfilter_null_get_audio_buffer(AVFilterLink *link, int perms, enum AVSampleFormat sample_fmt, int size, - int64_t channel_layout, int planar); + uint64_t channel_layout, int planar); /** * Filter definition. This defines the pads a filter contains, and all the @@ -589,7 +589,7 @@ struct AVFilterLink { int h; ///< agreed upon image height AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio /* These two parameters apply only to audio */ - int64_t channel_layout; ///< channel layout of current buffer (see libavutil/audioconvert.h) + uint64_t channel_layout; ///< channel layout of current buffer (see libavutil/audioconvert.h) int64_t sample_rate; ///< samples per second int format; ///< agreed upon media format @@ -688,7 +688,7 @@ avfilter_get_video_buffer_ref_from_arrays(uint8_t *data[4], int linesize[4], int */ AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, int perms, enum AVSampleFormat sample_fmt, int size, - int64_t channel_layout, int planar); + uint64_t channel_layout, int planar); /** * Request an input frame from the filter at the other end of the link. diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index b891ab1f22..4c7e878f9e 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -57,7 +57,7 @@ AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, int per AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int perms, enum AVSampleFormat sample_fmt, int size, - int64_t channel_layout, int planar) + uint64_t channel_layout, int planar) { AVFilterBuffer *samples = av_mallocz(sizeof(AVFilterBuffer)); AVFilterBufferRef *ref = NULL; @@ -292,7 +292,7 @@ AVFilterBufferRef *avfilter_null_get_video_buffer(AVFilterLink *link, int perms, AVFilterBufferRef *avfilter_null_get_audio_buffer(AVFilterLink *link, int perms, enum AVSampleFormat sample_fmt, int size, - int64_t channel_layout, int packed) + uint64_t channel_layout, int packed) { return avfilter_get_audio_buffer(link->dst->outputs[0], perms, sample_fmt, size, channel_layout, packed); -- cgit v1.2.3