diff amr.c @ 1169:d18cc9a1fd02 libavformat

allow individual selection of muxers and demuxers
author mru
date Mon, 10 Jul 2006 21:14:37 +0000
parents d89d7ef290da
children 996ce2a68147
line wrap: on
line diff
--- a/amr.c	Mon Jul 10 12:10:10 2006 +0000
+++ b/amr.c	Mon Jul 10 21:14:37 2006 +0000
@@ -215,7 +215,8 @@
     return 0;
 }
 
-static AVInputFormat amr_demuxer = {
+#ifdef CONFIG_AMR_DEMUXER
+AVInputFormat amr_demuxer = {
     "amr",
     "3gpp amr file format",
     0, /*priv_data_size*/
@@ -224,9 +225,10 @@
     amr_read_packet,
     amr_read_close,
 };
+#endif
 
-#ifdef CONFIG_MUXERS
-static AVOutputFormat amr_muxer = {
+#ifdef CONFIG_AMR_MUXER
+AVOutputFormat amr_muxer = {
     "amr",
     "3gpp amr file format",
     "audio/amr",
@@ -239,12 +241,3 @@
     amr_write_trailer,
 };
 #endif
-
-int amr_init(void)
-{
-    av_register_input_format(&amr_demuxer);
-#ifdef CONFIG_MUXERS
-    av_register_output_format(&amr_muxer);
-#endif
-    return 0;
-}