move dirac demuxer to its own file

Originally committed as revision 24981 to svn://svn.ffmpeg.org/ffmpeg/trunk

3 files changed, 44 insertions, 24 deletions

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 2ad53e76c3..7ccc033362 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -52,7 +52,7 @@ OBJS-$(CONFIG_CDG_DEMUXER)               += cdg.o
 OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.o
 OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
 OBJS-$(CONFIG_DAUD_MUXER)                += daud.o
-OBJS-$(CONFIG_DIRAC_DEMUXER)             += raw.o
+OBJS-$(CONFIG_DIRAC_DEMUXER)             += diracdec.o raw.o
 OBJS-$(CONFIG_DIRAC_MUXER)               += raw.o
 OBJS-$(CONFIG_DNXHD_DEMUXER)             += raw.o
 OBJS-$(CONFIG_DNXHD_MUXER)               += raw.o
diff --git a/libavformat/diracdec.c b/libavformat/diracdec.c
new file mode 100644
index 0000000000..5293988c80
--- /dev/null
+++ b/libavformat/diracdec.c
@@ -0,0 +1,43 @@
+/*
+ * RAW Dirac demuxer
+ * Copyright (c) 2007 Marco Gerards <marco@gnu.org>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "raw.h"
+
+static int dirac_probe(AVProbeData *p)
+{
+    if (AV_RL32(p->buf) == MKTAG('B', 'B', 'C', 'D'))
+        return AVPROBE_SCORE_MAX;
+    else
+        return 0;
+}
+
+AVInputFormat dirac_demuxer = {
+    "dirac",
+    NULL_IF_CONFIG_SMALL("raw Dirac"),
+    0,
+    dirac_probe,
+    ff_raw_video_read_header,
+    ff_raw_read_partial_packet,
+    .flags= AVFMT_GENERIC_INDEX,
+    .value = CODEC_ID_DIRAC,
+};
diff --git a/libavformat/raw.c b/libavformat/raw.c
index ac6882b3f7..2708e0e191 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -241,16 +241,6 @@ int ff_raw_video_read_header(AVFormatContext *s,
 }
 #endif
 
-#if CONFIG_DIRAC_DEMUXER
-static int dirac_probe(AVProbeData *p)
-{
-    if (AV_RL32(p->buf) == MKTAG('B', 'B', 'C', 'D'))
-        return AVPROBE_SCORE_MAX;
-    else
-        return 0;
-}
-#endif
-
 #if CONFIG_DNXHD_DEMUXER
 static int dnxhd_probe(AVProbeData *p)
 {
@@ -358,19 +348,6 @@ AVOutputFormat ac3_muxer = {
 };
 #endif
 
-#if CONFIG_DIRAC_DEMUXER
-AVInputFormat dirac_demuxer = {
-    "dirac",
-    NULL_IF_CONFIG_SMALL("raw Dirac"),
-    0,
-    dirac_probe,
-    ff_raw_video_read_header,
-    ff_raw_read_partial_packet,
-    .flags= AVFMT_GENERIC_INDEX,
-    .value = CODEC_ID_DIRAC,
-};
-#endif
-
 #if CONFIG_DIRAC_MUXER
 AVOutputFormat dirac_muxer = {
     "dirac",