[SCM] ffmpeg/master.snapshot: sort gpl_confflags

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit 4dd74fcd3e2214c3a64bffdb419df403cb36b2c0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 23 09:11:25 2011 +0100

    sort gpl_confflags

diff --git a/debian/confflags b/debian/confflags
index 3f0dc16..09aed1b 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -125,10 +125,10 @@ confflags += $(extra_common_confflags)
 
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
 gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
-gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
-gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
-gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
 gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
+gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
+gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
+gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
 
 # Opencore-amr requires GPL v3
 v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)

-- 
FFmpeg packaging