[SCM] libav/experimental: cosmetics: Put audio (de)muxer entries in alphabetical order.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:58:31 UTC 2013
The following commit has been merged in the experimental branch:
commit e011ef1a85f875dfef7eb12494a5f6bd7e780270
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Apr 3 15:57:38 2007 +0000
cosmetics: Put audio (de)muxer entries in alphabetical order.
Originally committed as revision 8614 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 93bef87..2e5fa97 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -22,6 +22,8 @@ OBJS-$(CONFIG_ASF_MUXER) += asf-enc.o riff.o
OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.o riff.o
OBJS-$(CONFIG_AU_DEMUXER) += au.o riff.o
OBJS-$(CONFIG_AU_MUXER) += au.o riff.o
+OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
+OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o
OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o
OBJS-$(CONFIG_AVISYNTH) += avisynth.o
@@ -150,9 +152,6 @@ ifeq ($(CONFIG_BKTR),yes)
OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o
endif
-OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
-OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
-
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
-lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list