[SCM] libav/experimental: cosmetics: sort()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:59:16 UTC 2013


The following commit has been merged in the experimental branch:
commit c23a470800835202f497bb7451adaeaa2465ed42
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Apr 26 18:31:33 2007 +0000

    cosmetics: sort()
    
    Originally committed as revision 8837 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 92f387f..cfc324d 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -92,13 +92,12 @@ OBJS-$(CONFIG_OGG_DEMUXER)               += ogg2.o           \
                                             riff.o
 OBJS-$(CONFIG_OGG_MUXER)                 += ogg.o
 OBJS-$(CONFIG_STR_DEMUXER)               += psxstr.o
-OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o
-OBJS-$(CONFIG_FLAC_DEMUXER)              += raw.o
-OBJS-$(CONFIG_FLAC_MUXER)                += raw.o
+OBJS-$(CONFIG_AAC_DEMUXER)               += raw.o
 OBJS-$(CONFIG_AC3_DEMUXER)               += raw.o
 OBJS-$(CONFIG_AC3_MUXER)                 += raw.o
 OBJS-$(CONFIG_DTS_DEMUXER)               += raw.o
-OBJS-$(CONFIG_AAC_DEMUXER)               += raw.o
+OBJS-$(CONFIG_FLAC_DEMUXER)              += raw.o
+OBJS-$(CONFIG_FLAC_MUXER)                += raw.o
 OBJS-$(CONFIG_H261_DEMUXER)              += raw.o
 OBJS-$(CONFIG_H261_MUXER)                += raw.o
 OBJS-$(CONFIG_H263_DEMUXER)              += raw.o
@@ -113,9 +112,10 @@ OBJS-$(CONFIG_MPEG2VIDEO_MUXER)          += raw.o
 OBJS-$(CONFIG_MJPEG_DEMUXER)             += raw.o
 OBJS-$(CONFIG_INGENIENT_DEMUXER)         += raw.o
 OBJS-$(CONFIG_MJPEG_MUXER)               += raw.o
+OBJS-$(CONFIG_NULL_MUXER)                += raw.o
 OBJS-$(CONFIG_RAWVIDEO_DEMUXER)          += raw.o
 OBJS-$(CONFIG_RAWVIDEO_MUXER)            += raw.o
-OBJS-$(CONFIG_NULL_MUXER)                += raw.o
+OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o
 OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o riff.o
 OBJS-$(CONFIG_RM_DEMUXER)                += rm.o
 OBJS-$(CONFIG_RM_MUXER)                  += rm.o

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list