diff -u libavg-0.8.0/debian/changelog libavg-0.8.0/debian/changelog
--- libavg-0.8.0/debian/changelog
+++ libavg-0.8.0/debian/changelog
@@ -1,3 +1,11 @@
+libavg (0.8.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * fix #include statements for new location of ffmpeg headers
+    (Closes: #516951)
+
+ -- Reinhard Tartler <siretart@tauware.de>  Tue, 24 Feb 2009 21:32:35 +0100
+
 libavg (0.8.0-2) unstable; urgency=low
 
   * Add patch gcc-4.4.diff provided by Martin Michlmayr.
diff -u libavg-0.8.0/debian/patches/series libavg-0.8.0/debian/patches/series
--- libavg-0.8.0/debian/patches/series
+++ libavg-0.8.0/debian/patches/series
@@ -1 +1,2 @@
+fix-ffmpeg-includes.diff
 gcc-4.4.diff 
only in patch2:
unchanged:
--- libavg-0.8.0.orig/debian/patches/fix-ffmpeg-includes.diff
+++ libavg-0.8.0/debian/patches/fix-ffmpeg-includes.diff
@@ -0,0 +1,60 @@
+--- a/src/video/FFMpegDecoder.h
++++ b/src/video/FFMpegDecoder.h
+@@ -46,10 +46,10 @@
+ #endif
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ #ifdef AVG_ENABLE_SWSCALE
+-#include <ffmpeg/swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+ }
+ #include <boost/thread/mutex.hpp>
+--- a/src/video/FFMpegDemuxer.h
++++ b/src/video/FFMpegDemuxer.h
+@@ -42,7 +42,7 @@ extern "C" {
+ #pragma warning(push)
+ #pragma warning(disable:4244)
+ #endif
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ #ifdef _WIN32
+ #pragma warning(pop)
+ #endif
+--- a/src/video/AudioVideoMsg.h
++++ b/src/video/AudioVideoMsg.h
+@@ -42,7 +42,7 @@
+ #endif
+ 
+ extern "C" {
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ }
+ 
+ namespace avg {
+--- a/src/video/IDemuxer.h
++++ b/src/video/IDemuxer.h
+@@ -42,7 +42,7 @@ extern "C" {
+ #pragma warning(push)
+ #pragma warning(disable:4244)
+ #endif
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ #ifdef _WIN32
+ #pragma warning(pop)
+ #endif
+--- a/src/video/PacketVideoMsg.h
++++ b/src/video/PacketVideoMsg.h
+@@ -39,7 +39,7 @@
+ #endif
+ 
+ extern "C" {
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ }
+ 
+ #include <vector>