SRTP: remove dedicated gcrypt initialization, use VLC one

[vlc] / modules / access / avio.h

diff --git a/modules/access/avio.h b/modules/access/avio.h
index 5497d346d5176d0e6733eba6081c94ec116ac18c..c0de75c5a2a1f364f494ac7839c866ea28ee1e6f 100644 (file)
--- a/modules/access/avio.h
+++ b/modules/access/avio.h
@@ -24,6 +24,9 @@
 /* ffmpeg header */
 #if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
 #   include <libavformat/avformat.h>
+#   if defined(HAVE_LIBAVFORMAT_AVIO_H)
+#      include <libavformat/avio.h>
+#   endif
 #elif defined(HAVE_FFMPEG_AVFORMAT_H)
 #   include <ffmpeg/avformat.h>
 #endif
@@ -31,7 +34,7 @@ int  OpenAvio (vlc_object_t *);
 void CloseAvio(vlc_object_t *);
 
 #define AVIO_MODULE \
-    set_shortname(N_("Avio"))               \
+    set_shortname(N_("FFmpeg"))             \
     set_description(N_("FFmpeg access") )   \
     set_category(CAT_INPUT)                 \
     set_subcategory(SUBCAT_INPUT_ACCESS)    \