[SCM] ffmpeg/master.snapshot: enable dirac conditionally (not in ubuntu/main)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit 659659f82df480c9f96236970f8d5bc702a56909
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 23 09:20:48 2011 +0100

    enable dirac conditionally (not in ubuntu/main)

diff --git a/debian/confflags b/debian/confflags
index 2944165..e2b79b8 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -97,7 +97,6 @@ confflags += --enable-avfilter
 confflags += --enable-avfilter-lavf
 confflags += --enable-vdpau
 confflags += --enable-bzlib
-confflags += --enable-libdirac
 confflags += --enable-libgsm
 confflags += --enable-libschroedinger
 confflags += --enable-libspeex
@@ -123,6 +122,7 @@ endif
 confflags += $(extra_common_confflags)
 
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
+gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h)
 gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
 gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
 gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)

-- 
FFmpeg packaging