diff -Nru opal-3.10.1~dfsg/debian/changelog opal-3.10.1~dfsg/debian/changelog
--- opal-3.10.1~dfsg/debian/changelog	2011-07-12 09:28:26.000000000 +0100
+++ opal-3.10.1~dfsg/debian/changelog	2011-09-06 17:52:29.000000000 +0100
@@ -1,3 +1,9 @@
+opal (3.10.1~dfsg-1ubuntu1) UNRELEASED; urgency=low
+
+  * Port to libav 0.7 API.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 06 Sep 2011 17:52:21 +0100
+
 opal (3.10.1~dfsg-1) experimental; urgency=low
 
   * New upstream release: 3.10.1 (Luythen)
diff -Nru opal-3.10.1~dfsg/debian/control opal-3.10.1~dfsg/debian/control
--- opal-3.10.1~dfsg/debian/control	2011-07-12 08:34:39.000000000 +0100
+++ opal-3.10.1~dfsg/debian/control	2011-09-06 17:52:34.000000000 +0100
@@ -1,7 +1,8 @@
 Source: opal
 Section: libs
 Priority: optional
-Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>, Kilian Krause <kilian@debian.org>, Tzafrir Cohen <tzafrir@debian.org>
 Build-Depends: debhelper (>= 8), doxygen, autotools-dev, pkg-config,
  libpt-dev (>= 2.10.1~), libavcodec-dev,
diff -Nru opal-3.10.1~dfsg/debian/patches/libav_0.7.patch opal-3.10.1~dfsg/debian/patches/libav_0.7.patch
--- opal-3.10.1~dfsg/debian/patches/libav_0.7.patch	1970-01-01 01:00:00.000000000 +0100
+++ opal-3.10.1~dfsg/debian/patches/libav_0.7.patch	2011-09-06 18:04:39.000000000 +0100
@@ -0,0 +1,68 @@
+Description: Port to libav 0.7 API
+Author: Colin Watson <cjwatson@ubuntu.com>
+Forwarded: no
+Last-Update: 2011-09-06
+
+Index: b/plugins/video/H.263-1998/h263-1998.cxx
+===================================================================
+--- a/plugins/video/H.263-1998/h263-1998.cxx
++++ b/plugins/video/H.263-1998/h263-1998.cxx
+@@ -334,8 +334,10 @@
+   _context->qmax = round ( (31.0 - H263P_MIN_QUANT) / 31.0 * tsto + H263P_MIN_QUANT);
+   _context->qmax = std::min( _context->qmax, 31);
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 53
+   _context->mb_qmin = _context->qmin;
+   _context->mb_qmax = _context->qmax;
++#endif
+ 
+   // Lagrange multipliers - this is how the context defaults do it:
+   _context->lmin = _context->qmin * FF_QP2LAMBDA;
+@@ -660,7 +662,11 @@
+ 
+   _inputFrame->data[1] = _inputFrame->data[0] + size;
+   _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 1, 0)
+   _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
++#else
++  _inputFrame->pict_type = (flags && forceIFrame) ? AV_PICTURE_TYPE_I : (AVPictureType) 0;
++#endif
+ 
+   currentMb = 0;
+   currentBytes = 0;
+@@ -863,7 +869,11 @@
+   _inputFrame->data[0] = _inputFrameBuffer + FF_INPUT_BUFFER_PADDING_SIZE;
+   _inputFrame->data[1] = _inputFrame->data[0] + size;
+   _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 1, 0)
+   _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
++#else
++  _inputFrame->pict_type = (flags && forceIFrame) ? AV_PICTURE_TYPE_I : (AVPictureType) 0;
++#endif
+  
+   _txH263PFrame->BeginNewFrame();
+   _txH263PFrame->SetTimestamp(srcRTP.GetTimestamp());
+Index: b/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+===================================================================
+--- a/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
++++ b/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+@@ -804,11 +804,19 @@
+         // Should the next frame be an I-Frame?
+         if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
+         {
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 1, 0)
+             m_avpicture->pict_type = FF_I_TYPE;
++#else
++            m_avpicture->pict_type = AV_PICTURE_TYPE_I;
++#endif
+         }
+         else // No IFrame requested, let avcodec decide what to do
+         {
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 1, 0)
+             m_avpicture->pict_type = 0;
++#else
++            m_avpicture->pict_type = (AVPictureType) 0;
++#endif
+         }
+ 
+         // Encode a frame
diff -Nru opal-3.10.1~dfsg/debian/patches/series opal-3.10.1~dfsg/debian/patches/series
--- opal-3.10.1~dfsg/debian/patches/series	2011-07-12 09:28:17.000000000 +0100
+++ opal-3.10.1~dfsg/debian/patches/series	2011-09-06 17:46:56.000000000 +0100
@@ -1,2 +1,3 @@
 plugins_clean_target.patch
 spandsp_autoconf_cppflags.patch
+libav_0.7.patch