avformat demux: use new IO API

[vlc] / modules / demux / avformat / avformat.c

diff --git a/modules/demux/avformat/avformat.c b/modules/demux/avformat/avformat.c
index 59a5862fd279aef65b2ee41f62fd8fbc434a3f4a..70ce57f303a4603d8926c1ec854890870a606bd4 100644 (file)
--- a/modules/demux/avformat/avformat.c
+++ b/modules/demux/avformat/avformat.c
@@ -22,44 +22,36 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
+#ifndef MERGE_FFMPEG
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_codec.h>
-
-/* ffmpeg header */
-#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-#   include <libavformat/avformat.h>
-#elif defined(HAVE_FFMPEG_AVFORMAT_H)
-#   include <ffmpeg/avformat.h>
-#endif
 
 #include "avformat.h"
 
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-vlc_module_begin();
-    add_shortcut( "ffmpeg" );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_SCODEC );
-    set_description( N_("FFmpeg demuxer" ) );
-    set_capability( "demux", 2 );
-    set_callbacks( OpenDemux, CloseDemux );
+vlc_module_begin ()
+#endif /* MERGE_FFMPEG */
+    add_shortcut( "ffmpeg", "avformat" )
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_DEMUX )
+    set_description( N_("Avformat demuxer" ) )
+    set_shortname( N_("Avformat") )
+    set_capability( "demux", 2 )
+    set_callbacks( OpenDemux, CloseDemux )
 
 #ifdef ENABLE_SOUT
     /* mux submodule */
-    add_submodule();
-    set_description( N_("FFmpeg muxer" ) );
-    set_capability( "sout mux", 2 );
-    add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT,
-                MUX_LONGTEXT, true );
-    set_callbacks( OpenMux, CloseMux );
+    add_submodule ()
+    add_shortcut( "ffmpeg", "avformat" )
+    set_description( N_("Avformat muxer" ) )
+    set_capability( "sout mux", 2 )
+    add_string( "ffmpeg-mux", NULL, MUX_TEXT,
+                MUX_LONGTEXT, true )
+    set_callbacks( OpenMux, CloseMux )
+#endif
+#ifndef MERGE_FFMPEG
+vlc_module_end ()
 #endif
-vlc_module_end();