[SCM] libav/experimental: cosmetics: Reorder NUT entries.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7a7a6486aacae9d6b9d4af0e14d5770f5c105b3c
Author: Diego Biurrun <diego at biurrun.de>
Date:   Fri Feb 9 08:30:51 2007 +0000

    cosmetics: Reorder NUT entries.
    
    Originally committed as revision 7892 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 2c2316d..204145c 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -110,6 +110,8 @@ OBJS-$(CONFIG_MJPEG_MUXER)               += raw.o
 OBJS-$(CONFIG_RAWVIDEO_DEMUXER)          += raw.o
 OBJS-$(CONFIG_RAWVIDEO_MUXER)            += raw.o
 OBJS-$(CONFIG_NULL_MUXER)                += raw.o
+OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o riff.o
+#OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o riff.o
 OBJS-$(CONFIG_RM_DEMUXER)                += rm.o
 OBJS-$(CONFIG_RM_MUXER)                  += rm.o
 OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
@@ -133,6 +135,10 @@ OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER)   += x11grab.o
 OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER)        += yuv4mpeg.o
 OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER)      += yuv4mpeg.o
 
+# external libraries
+OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o riff.o
+OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
+
 OBJS+= framehook.o
 
 ifeq ($(CONFIG_VIDEO4LINUX),yes)
@@ -165,12 +171,6 @@ OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o
 endif
 endif
 
-OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o riff.o
-OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
-
-OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o riff.o
-#OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o riff.o
-
 NAME=avformat
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVFVERSION)

-- 
Libav/FFmpeg packaging