avformat/mpegtsenc: move is_dvb_subtitle/is_dvb_teletext initialization upwards

[ffmpeg] / libavutil / tests / avstring.c

diff --git a/libavutil/tests/avstring.c b/libavutil/tests/avstring.c
index 887bd25a1266f8f6547cff99d3d761403011c207..37a2cf1833426a2329cbe59c9771fb3c1ced68f3 100644 (file)
--- a/libavutil/tests/avstring.c
+++ b/libavutil/tests/avstring.c
@@ -109,6 +109,8 @@ int main(void)
     TEST_STRIREPLACE(haystack, needle [2], "Education consists mainly in what we have instead.");
     TEST_STRIREPLACE(haystack, needle [1], "Education consists mainly in what we have instead");
 
+#if FF_API_D2STR
+FF_DISABLE_DEPRECATION_WARNINGS
     /*Testing av_d2str()*/
     #define TEST_D2STR(value, expected) \
         if((ptr = av_d2str(value)) == NULL){ \
@@ -121,5 +123,7 @@ int main(void)
     TEST_D2STR(0         ,  "0.000000");
     TEST_D2STR(-1.2333234, "-1.233323");
     TEST_D2STR(-1.2333237, "-1.233324");
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
     return 0;
 }