MXF demuxer

Originally committed as revision 5826 to svn://svn.ffmpeg.org/ffmpeg/trunk
FFmpeg · Jul 25, 2006 · 07bf2af · 07bf2af
1 parent 43dcf59
commit 07bf2af
Show file tree

Hide file tree

Showing 6 changed files with 515 additions and 0 deletions.
diff --git a/Changelog b/Changelog
@@ -51,6 +51,7 @@ version <next>
 - GXF demuxer
 - Chinese AVS decoder
 - GXF muxer
+- MXF demuxer
 
 version 0.4.9-pre1:
 

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -198,6 +198,7 @@ Muxers/Demuxers:
   img2.c                                Michael Niedermayer
   mov.c                                 Francois Revol, Michael Niedermayer
   mpegts*                               Mans Rullgard
+  mxf.c                                 Baptiste Coudurier
   nsvdec.c                              Francois Revol
   nut.c                                 Alex Beregszaszi
   nuv.c                                 Reimar Doeffinger

diff --git a/libavformat/Makefile b/libavformat/Makefile
@@ -75,6 +75,7 @@ OBJS-$(CONFIG_MPEGPS_DEMUXER)            += mpeg.o
 OBJS-$(CONFIG_MPEGTS_DEMUXER)            += mpegts.o
 OBJS-$(CONFIG_MPEGTS_MUXER)              += mpegtsenc.o
 OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.o
+OBJS-$(CONFIG_MXF_DEMUXER)               += mxf.o
 OBJS-$(CONFIG_NSV_DEMUXER)               += nsvdec.o riff.o
 OBJS-$(CONFIG_NUT_DEMUXER)               += nut.o riff.o
 OBJS-$(CONFIG_NUT_MUXER)                 += nut.o riff.o

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
@@ -240,6 +240,9 @@ void av_register_all(void)
 #ifdef CONFIG_MPJPEG_MUXER
     av_register_output_format(&mpjpeg_muxer);
 #endif
+#ifdef CONFIG_MXF_DEMUXER
+    av_register_input_format(&mxf_demuxer);
+#endif
 #ifdef CONFIG_NSV_DEMUXER
     av_register_input_format(&nsv_demuxer);
 #endif

diff --git a/libavformat/allformats.h b/libavformat/allformats.h
@@ -69,6 +69,7 @@ extern AVInputFormat mpegps_demuxer;
 extern AVInputFormat mpegts_demuxer;
 extern AVOutputFormat mpegts_muxer;
 extern AVOutputFormat mpjpeg_muxer;
+extern AVInputFormat mxf_demuxer;
 extern AVInputFormat nsv_demuxer;
 extern AVInputFormat nut_demuxer;
 extern AVOutputFormat nut_muxer;