vf_drawtext: make strftime work without localtime_r()

[ffmpeg] / libavutil / audioconvert.c

diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 60743de22a0e954417db7db68dc1b5cc071a7a08..61dd6f3ccc81a9c136c3f0bbf7821464bf7e4416 100644 (file)
--- a/libavutil/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -51,9 +51,9 @@ static const struct {
     { "stereo",      2,  AV_CH_LAYOUT_STEREO },
     { "4.0",         4,  AV_CH_LAYOUT_4POINT0 },
     { "quad",        4,  AV_CH_LAYOUT_QUAD },
-    { "5.0",         5,  AV_CH_LAYOUT_5POINT0 },
+    { "5.0(side)",   5,  AV_CH_LAYOUT_5POINT0 },
     { "5.0",         5,  AV_CH_LAYOUT_5POINT0_BACK },
-    { "5.1",         6,  AV_CH_LAYOUT_5POINT1 },
+    { "5.1(side)",   6,  AV_CH_LAYOUT_5POINT1 },
     { "5.1",         6,  AV_CH_LAYOUT_5POINT1_BACK },
     { "5.1+downmix", 8,  AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
     { "7.1",         8,  AV_CH_LAYOUT_7POINT1 },