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

The functions will also be used for unsigned formats.

libavdevice/alsa-audio-common.c

@@ -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;
 }