From a66d44f0d2bad97fc1db0304a6bb5a6fa6824414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 21 Oct 2010 12:19:14 +0000 Subject: [PATCH] Restore alphabetical order Originally committed as revision 25536 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 56550dcd49..40adb537fb 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -229,11 +229,6 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtpenc_vp8.o \ rtpenc_xiph.o \ avc.o -OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o httpauth.o -OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o httpauth.o \ - rtpenc_chain.o -OBJS-$(CONFIG_SAP_DEMUXER) += sapdec.o -OBJS-$(CONFIG_SAP_MUXER) += sapenc.o rtpenc_chain.o OBJS-$(CONFIG_RTPDEC) += rdt.o \ rtp.o \ rtpdec.o \ @@ -248,6 +243,11 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \ rtpdec_svq3.o \ rtpdec_vp8.o \ rtpdec_xiph.o +OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o httpauth.o +OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o httpauth.o \ + rtpenc_chain.o +OBJS-$(CONFIG_SAP_DEMUXER) += sapdec.o +OBJS-$(CONFIG_SAP_MUXER) += sapenc.o rtpenc_chain.o OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o OBJS-$(CONFIG_SHORTEN_DEMUXER) += rawdec.o