reassign 516951 libavg
thanks

Kurt Roeckx <k...@roeckx.be> writes:

> Your package is failing to build with the following error:
> In file included from ../../../src/video/FFMpegDemuxer.h:25,
>                  from ../../../src/video/FFMpegDemuxer.cpp:22:
> ../../../src/video/IDemuxer.h:45:29: error: ffmpeg/avformat.h: No such file 
> or directory
>
> [...]
>
> It seems that the include file moved to
> /usr/include/libavformat/avformat.h but that
> the libavformat.pc was not properly changed.

no, libavformat.pc is okay. Here is a patch (and a debdiff to a
potential NMU) to fix this bug:

--- 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>

Attachment: libavg.debdiff
Description: Binary data

Thorsten, please indicate if you can upload soon. If not, I can upload
in 3 days, as asked by dato from the release team

-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4

Reply via email to