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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit 8b3d9dc2d24064089edabbd9c3c8dc9ec6deeae1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 23 09:16:28 2011 +0100

    enable libopenjpeg conditionally (not in ubuntu/main)

diff --git a/debian/confflags b/debian/confflags
index 09aed1b..2944165 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -99,7 +99,6 @@ confflags += --enable-vdpau
 confflags += --enable-bzlib
 confflags += --enable-libdirac
 confflags += --enable-libgsm
-confflags += --enable-libopenjpeg
 confflags += --enable-libschroedinger
 confflags += --enable-libspeex
 confflags += --enable-libtheora
@@ -130,6 +129,8 @@ 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)
 
+confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
+
 # Opencore-amr requires GPL v3
 v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
 v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrwb/dec_if.h,libopencore-amrwb)

-- 
FFmpeg packaging