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/avcodec.h | |
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/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dc794b0538..8005af4fd5 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2696,14 +2696,14 @@ typedef struct AVCodecContext { * - encoding: set by user. * - decoding: set by libavcodec. */ - int64_t channel_layout; + uint64_t channel_layout; /** * Request decoder to use this channel layout if it can (0 for default) * - encoding: unused * - decoding: Set by user. */ - int64_t request_channel_layout; + uint64_t request_channel_layout; /** * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow. @@ -3044,7 +3044,7 @@ typedef struct AVCodec { const char *long_name; const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0 const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1 - const int64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0 + const uint64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0 uint8_t max_lowres; ///< maximum value for lowres supported by the decoder const AVClass *priv_class; ///< AVClass for the private context const AVProfile *profiles; ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN} |