X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Favio.h;h=c0de75c5a2a1f364f494ac7839c866ea28ee1e6f;hb=031832b073a007703bc3239c4689562d0cf9439c;hp=7e956d065a79453c59f88653152fdaf45ecc62c2;hpb=f0a61cd7c0a711c1191239a8adf72e3de971b8b9;p=vlc

diff --git a/modules/access/avio.h b/modules/access/avio.h
index 7e956d065a..c0de75c5a2 100644
--- 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,12 +34,11 @@ 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)    \
     set_capability("access", -1)            \
-    add_shortcut("avio")                    \
-    add_shortcut("rtmp")                    \
+    add_shortcut("avio", "rtmp")            \
     set_callbacks(OpenAvio, CloseAvio)