diff -Nru /tmp/OEL0JhfXFY/ffmpeg-0.cvs20070307/debian/changelog /tmp/At7kktGnLl/ffmpeg-0.cvs20070307/debian/changelog
--- /tmp/OEL0JhfXFY/ffmpeg-0.cvs20070307/debian/changelog	2007-08-06 21:21:49.000000000 +0200
+++ /tmp/At7kktGnLl/ffmpeg-0.cvs20070307/debian/changelog	2007-08-06 21:21:49.000000000 +0200
@@ -1,3 +1,13 @@
+ffmpeg (3:0.cvs20070307-5ubuntu5) gutsy; urgency=low
+
+  * Implemented 061_fix_resample_warnings.diff
+      Fixes LP #122266
+  * debian/control: 
+    - set MOTU as maintainer
+    - set XSBC-Original-Maintainer: Debian multimedia packages maintainers 
+
+ -- Mario Danic <mario.danic@gmail.com>  Mon, 06 Aug 2007 16:19:27 +0200
+
 ffmpeg (3:0.cvs20070307-5ubuntu4) gutsy; urgency=low
 
   * make ffmpeg-config not add -ldts and -la52 to LDFLAGS. fixes FTBFS in
diff -Nru /tmp/OEL0JhfXFY/ffmpeg-0.cvs20070307/debian/control /tmp/At7kktGnLl/ffmpeg-0.cvs20070307/debian/control
--- /tmp/OEL0JhfXFY/ffmpeg-0.cvs20070307/debian/control	2007-08-06 21:21:49.000000000 +0200
+++ /tmp/At7kktGnLl/ffmpeg-0.cvs20070307/debian/control	2007-08-06 21:21:49.000000000 +0200
@@ -1,7 +1,8 @@
 Source: ffmpeg
 Section: libs
 Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb@zoy.org>, Loic Minier <lool@dooz.org>, Reinhard Tartler <siretart@tauware.de>
 Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev
 Standards-Version: 3.7.2
diff -Nru /tmp/OEL0JhfXFY/ffmpeg-0.cvs20070307/debian/patches/061_fix_resample_warnings.diff /tmp/At7kktGnLl/ffmpeg-0.cvs20070307/debian/patches/061_fix_resample_warnings.diff
--- /tmp/OEL0JhfXFY/ffmpeg-0.cvs20070307/debian/patches/061_fix_resample_warnings.diff	1970-01-01 01:00:00.000000000 +0100
+++ /tmp/At7kktGnLl/ffmpeg-0.cvs20070307/debian/patches/061_fix_resample_warnings.diff	2007-08-06 21:21:49.000000000 +0200
@@ -0,0 +1,24 @@
+--- ffmpeg-0.cvs20070307.orig/libavcodec/avcodec.h	2007-03-07 14:37:04.000000000 +0100
++++ ffmpeg-0.cvs20070307/libavcodec/avcodec.h	2007-08-06 20:40:11.000000000 +0200
+@@ -2421,7 +2421,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ /* YUV420 format is assumed ! */
+ 
+-struct ImgReSampleContext attribute_deprecated;
++struct ImgReSampleContext;
+ 
+ typedef struct ImgReSampleContext ImgReSampleContext attribute_deprecated;
+ 
+@@ -2436,10 +2436,10 @@
+                                       int padleft, int padright);
+ 
+ 
+-attribute_deprecated void img_resample(ImgReSampleContext *s,
++attribute_deprecated void img_resample(struct ImgReSampleContext *s,
+                   AVPicture *output, const AVPicture *input);
+ 
+-attribute_deprecated void img_resample_close(ImgReSampleContext *s);
++attribute_deprecated void img_resample_close(struct ImgReSampleContext *s);
+ 
+ #endif
+ 
diff -Nru /tmp/OEL0JhfXFY/ffmpeg-0.cvs20070307/debian/patches/series /tmp/At7kktGnLl/ffmpeg-0.cvs20070307/debian/patches/series
--- /tmp/OEL0JhfXFY/ffmpeg-0.cvs20070307/debian/patches/series	2007-08-06 21:21:49.000000000 +0200
+++ /tmp/At7kktGnLl/ffmpeg-0.cvs20070307/debian/patches/series	2007-08-06 21:21:49.000000000 +0200
@@ -18,4 +18,5 @@
 053_rm_demux_crash.diff
 054_h264_mmx_chroma_mc_crash.diff
 060_fix_avi_skip.diff
+061_fix_resample_warnings.diff
 300_c++_compliant_headers.diff