[FFmpeg-soc] [soc]: r696 - matroska/mkv-muxer.diff

[conrad]

Author: conrad
Date: Sat Aug 11 21:55:17 2007
New Revision: 696

Log:
Alphabetize


Modified:
   matroska/mkv-muxer.diff

Modified: matroska/mkv-muxer.diff
==============================================================================
--- matroska/mkv-muxer.diff	(original)
+++ matroska/mkv-muxer.diff	Sat Aug 11 21:55:17 2007
@@ -1,5 +1,5 @@
 diff --git a/libavformat/Makefile b/libavformat/Makefile
-index 4263719..6ab86df 100644
+index 794d212..91ab90c 100644
 --- a/libavformat/Makefile
 +++ b/libavformat/Makefile
 @@ -72,6 +72,7 @@ OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.o
@@ -11,10 +11,10 @@ index 4263719..6ab86df 100644
  OBJS-$(CONFIG_MJPEG_MUXER)               += raw.o
  OBJS-$(CONFIG_MM_DEMUXER)                += mm.o
 diff --git a/libavformat/allformats.c b/libavformat/allformats.c
-index 6c5f6de..7031370 100644
+index a71f1bf..a5bedd5 100644
 --- a/libavformat/allformats.c
 +++ b/libavformat/allformats.c
-@@ -92,7 +92,8 @@ void av_register_all(void)
+@@ -91,7 +91,8 @@ void av_register_all(void)
      if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut);
      REGISTER_MUXER   (LIBNUT, libnut);
      REGISTER_MUXDEMUX(M4V, m4v);
@@ -25,15 +25,15 @@ index 6c5f6de..7031370 100644
      REGISTER_DEMUXER (MM, mm);
      REGISTER_MUXDEMUX(MMF, mmf);
 diff --git a/libavformat/allformats.h b/libavformat/allformats.h
-index fec5038..cc54856 100644
+index 73e942a..fcea3fa 100644
 --- a/libavformat/allformats.h
 +++ b/libavformat/allformats.h
 @@ -144,6 +144,8 @@ extern AVOutputFormat image_muxer;
  extern AVOutputFormat imagepipe_muxer;
  extern AVOutputFormat libnut_muxer;
  extern AVOutputFormat m4v_muxer;
-+extern AVOutputFormat matroska_muxer;
 +extern AVOutputFormat matroska_audio_muxer;
++extern AVOutputFormat matroska_muxer;
  extern AVOutputFormat mjpeg_muxer;
  extern AVOutputFormat mmf_muxer;
  extern AVOutputFormat mov_muxer;