The AAC demuxer now depends on id3v1.o.

[ffmpeg] / libavformat / mmf.c

diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 5e6d4ebccb7810486b49bfb255c4abc604501b31..ab2a9962ce7cf3411c4828fe81ce77432cbdd2d5 100644 (file)
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -36,7 +36,7 @@ static int mmf_rate(int code)
     return mmf_rates[code];
 }
 
-#ifdef CONFIG_MMF_MUXER
+#if CONFIG_MMF_MUXER
 static int mmf_rate_code(int rate)
 {
     int i;
@@ -290,10 +290,10 @@ static int mmf_read_packet(AVFormatContext *s,
     return ret;
 }
 
-#ifdef CONFIG_MMF_DEMUXER
+#if CONFIG_MMF_DEMUXER
 AVInputFormat mmf_demuxer = {
     "mmf",
-    NULL_IF_CONFIG_SMALL("mmf format"),
+    NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
     sizeof(MMFContext),
     mmf_probe,
     mmf_read_header,
@@ -302,10 +302,10 @@ AVInputFormat mmf_demuxer = {
     pcm_read_seek,
 };
 #endif
-#ifdef CONFIG_MMF_MUXER
+#if CONFIG_MMF_MUXER
 AVOutputFormat mmf_muxer = {
     "mmf",
-    NULL_IF_CONFIG_SMALL("mmf format"),
+    NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
     "application/vnd.smaf",
     "mmf",
     sizeof(MMFContext),