xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-27 21:40:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename the s16 and s32 alsa reorder functions as int16 and int32.

Browse Source 
The functions will also be used for unsigned formats.
This commit is contained in:
Carl Eugen Hoyos 2011-04-14 01:07:01 +02:00
parent 0ae2a0366f
commit 1171d45f6c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavdevice/alsa-audio-common.c
View File

@ -115,12 +115,12 @@ static void alsa_reorder_ ## NAME ## _out_71(const void *in_v, void *out_v, int
} \
}
REORDER_OUT_50(s16, int16_t)
REORDER_OUT_51(s16, int16_t)
REORDER_OUT_71(s16, int16_t)
REORDER_OUT_50(s32, int32_t)
REORDER_OUT_51(s32, int32_t)
REORDER_OUT_71(s32, int32_t)
REORDER_OUT_50(int16, int16_t)
REORDER_OUT_51(int16, int16_t)
REORDER_OUT_71(int16, int16_t)
REORDER_OUT_50(int32, int32_t)
REORDER_OUT_51(int32, int32_t)
REORDER_OUT_71(int32, int32_t)
#define REORDER_DUMMY ((void *)1)
@ -131,20 +131,20 @@ static av_cold ff_reorder_func find_reorder_func(int codec_id,
return
codec_id == CODEC_ID_PCM_S16LE || codec_id == CODEC_ID_PCM_S16BE ?
layout == AV_CH_LAYOUT_5POINT0_BACK || layout == AV_CH_LAYOUT_5POINT0 ?
out ? alsa_reorder_s16_out_50 : NULL :
out ? alsa_reorder_int16_out_50 : NULL :
layout == AV_CH_LAYOUT_QUAD ? REORDER_DUMMY :
layout == AV_CH_LAYOUT_5POINT1_BACK || layout == AV_CH_LAYOUT_5POINT1 ?
out ? alsa_reorder_s16_out_51 : NULL :
out ? alsa_reorder_int16_out_51 : NULL :
layout == AV_CH_LAYOUT_7POINT1 ?
out ? alsa_reorder_s16_out_71 : NULL :
out ? alsa_reorder_int16_out_71 : NULL :
NULL :
codec_id == CODEC_ID_PCM_S32LE || codec_id == CODEC_ID_PCM_S32BE ?
layout == AV_CH_LAYOUT_5POINT0_BACK || layout == AV_CH_LAYOUT_5POINT0 ?
out ? alsa_reorder_s32_out_50 : NULL :
out ? alsa_reorder_int32_out_50 : NULL :
layout == AV_CH_LAYOUT_5POINT1_BACK || layout == AV_CH_LAYOUT_5POINT1 ?
out ? alsa_reorder_s32_out_51 : NULL :
out ? alsa_reorder_int32_out_51 : NULL :
layout == AV_CH_LAYOUT_7POINT1 ?
out ? alsa_reorder_s32_out_71 : NULL :
out ? alsa_reorder_int32_out_71 : NULL :
NULL :
NULL;
}