diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-26 01:12:08 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-26 01:12:08 +0100 |
commit | 022f8d27dd0a61bfaae729d53d133b17418ea16b (patch) | |
tree | 351bff9edab8404f7850ee05a238c50e6364e19b /libavfilter/asrc_anullsrc.c | |
parent | a11eeb921571b23d1c988f9a2ddda109792948a6 (diff) | |
parent | f32dfad9dc64acf0fd1bb867e127a9efe6380676 (diff) | |
download | ffmpeg-022f8d27dd0a61bfaae729d53d133b17418ea16b.tar.gz |
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 'libavfilter/asrc_anullsrc.c')
-rw-r--r-- | libavfilter/asrc_anullsrc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c index 1bcc3eb9a6..288e2bf910 100644 --- a/libavfilter/asrc_anullsrc.c +++ b/libavfilter/asrc_anullsrc.c @@ -30,7 +30,7 @@ typedef struct { const AVClass *class; char *channel_layout_str; - int64_t channel_layout; + uint64_t channel_layout; char *sample_rate_str; int sample_rate; int nb_samples; ///< number of samples per requested frame |