diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-26 04:12:08 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-26 04:12:08 +0400 |
| commit | 022f8d27dd0a61bfaae729d53d133b17418ea16b (patch) | |
| tree | 351bff9edab8404f7850ee05a238c50e6364e19b /libavutil/audioconvert.h | |
| parent | a11eeb921571b23d1c988f9a2ddda109792948a6 (diff) | |
| parent | f32dfad9dc64acf0fd1bb867e127a9efe6380676 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: Readd #define _SVID_SOURCE
Fix av_get_channel_layout_string() for positions >31
configure: Store vda lib flags in extralibs instead of ldflags
Make channel layout masks unsigned
dca: ARMv6 optimised decode_blockcode()
nullenc: drop AVFMT_RAWPICTURE from the flags
frame-mt: return consumed packet size in ff_thread_decode_frame
aacdec: add more fate tests covering SBR and PS
MK(BE)TAG: avoid undefined shifts
Conflicts:
configure
libavcodec/arm/dca.h
libavcodec/dca.c
libavcodec/mlp_parser.c
libavcodec/version.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavutil/audioconvert.c
libavutil/avutil.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/audioconvert.h')
| -rw-r--r-- | libavutil/audioconvert.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h index 766ef8b9da..d0232d2aa3 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 /** * @} @@ -104,7 +104,7 @@ * AV_CH_* macros). + Example: "stereo+FC" = "2+FC" = "2c+1c" = "0x7" */ -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. @@ -113,12 +113,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); /** * Return default channel layout for a given number of channels. |