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 /libavdevice/alsa-audio-common.c | |
| parent | a11eeb921571b23d1c988f9a2ddda109792948a6 (diff) | |
| parent | f32dfad9dc64acf0fd1bb867e127a9efe6380676 (diff) | |
| download | ffmpeg-streaming-022f8d27dd0a61bfaae729d53d133b17418ea16b.zip ffmpeg-streaming-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 'libavdevice/alsa-audio-common.c')
| -rw-r--r-- | libavdevice/alsa-audio-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c index 1ed7b6e..cb7ba66 100644 --- a/libavdevice/alsa-audio-common.c +++ b/libavdevice/alsa-audio-common.c @@ -143,7 +143,7 @@ switch(format) {\ case FORMAT_F32: s->reorder_func = alsa_reorder_f32_out_ ##layout; break;\ } -static av_cold int find_reorder_func(AlsaData *s, int codec_id, int64_t layout, int out) +static av_cold int find_reorder_func(AlsaData *s, int codec_id, uint64_t layout, int out) { int format; @@ -194,7 +194,7 @@ av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode, snd_pcm_t *h; snd_pcm_hw_params_t *hw_params; snd_pcm_uframes_t buffer_size, period_size; - int64_t layout = ctx->streams[0]->codec->channel_layout; + uint64_t layout = ctx->streams[0]->codec->channel_layout; if (ctx->filename[0] == 0) audio_device = "default"; else audio_device = ctx->filename; |
