app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch

   1 diff -NrU5 k3b-1.0.5.orig/configure.in k3b-1.0.5/configure.in
   2 --- k3b-1.0.5.orig/configure.in 2008-07-07 20:36:06.000000000 +0200
   3 +++ k3b-1.0.5/configure.in      2008-07-07 20:39:13.000000000 +0200
   4 @@ -574,12 +574,12 @@
   5         AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
   6         AC_LANG_SAVE
   7         AC_LANG_CPLUSPLUS
   8         AC_COMPILE_IFELSE(
   9                 extern "C" {
  10 -               #include <ffmpeg/avformat.h>
  11 -               #include <ffmpeg/avcodec.h>
  12 +               #include <libavformat/avformat.h>
  13 +               #include <libavcodec/avcodec.h>
  14                 }
  15
  16                 int main() {
  17                   AVFormatContext* fc = 0;
  18                   AVPacket* p = 0;
  19 @@ -589,12 +589,12 @@
  20         [ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
  21         OLD_LIBS=$LIBS
  22         LIBS="-lavformat -lavcodec $LIBS"
  23         AC_LINK_IFELSE(
  24                 extern "C" {
  25 -               #include <ffmpeg/avformat.h>
  26 -               #include <ffmpeg/avcodec.h>
  27 +               #include <libavformat/avformat.h>
  28 +               #include <libavcodec/avcodec.h>
  29                 }
  30
  31                 int main() {
  32                   AVFormatContext* fc = 0;
  33                   AVPacket* p = 0;
  34 diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in
  35 --- k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in       2008-07-07 20:36:06.000000000 +0200
  36 +++ k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in    2008-07-07 20:43:02.000000000 +0200
  37 @@ -19,12 +19,12 @@
  38         AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
  39         AC_LANG_SAVE
  40         AC_LANG_CPLUSPLUS
  41         AC_COMPILE_IFELSE(
  42                 extern "C" {
  43 -               #include <ffmpeg/avformat.h>
  44 -               #include <ffmpeg/avcodec.h>
  45 +               #include <libavformat/avformat.h>
  46 +               #include <libavcodec/avcodec.h>
  47                 }
  48
  49                 int main() {
  50                   AVFormatContext* fc = 0;
  51                   AVPacket* p = 0;
  52 @@ -34,12 +34,12 @@
  53         [ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
  54         OLD_LIBS=$LIBS
  55         LIBS="-lavformat -lavcodec $LIBS"
  56         AC_LINK_IFELSE(
  57                 extern "C" {
  58 -               #include <ffmpeg/avformat.h>
  59 -               #include <ffmpeg/avcodec.h>
  60 +               #include <libavformat/avformat.h>
  61 +               #include <libavcodec/avcodec.h>
  62                 }
  63
  64                 int main() {
  65                   AVFormatContext* fc = 0;
  66                   AVPacket* p = 0;
  67 diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
  68 --- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp  2008-07-07 20:36:06.000000000 +0200
  69 +++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp       2008-07-07 20:45:07.000000000 +0200
  70 @@ -20,11 +20,11 @@
  71
  72  #include <kdebug.h>
  73  #include <k3bpluginfactory.h>
  74
  75  extern "C" {
  76 -#include <ffmpeg/avcodec.h>
  77 +#include <libavcodec/avcodec.h>
  78  }
  79
  80  #include <math.h>
  81
  82
  83 diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
  84 --- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp  2008-07-07 20:36:06.000000000 +0200
  85 +++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp       2008-07-07 20:44:02.000000000 +0200
  86 @@ -16,12 +16,12 @@
  87  #include <config.h>
  88
  89  #include "k3bffmpegwrapper.h"
  90
  91  extern "C" {
  92 -#include <ffmpeg/avcodec.h>
  93 -#include <ffmpeg/avformat.h>
  94 +#include <libavcodec/avcodec.h>
  95 +#include <libavformat/avformat.h>
  96  }
  97
  98  #include <string.h>
  99
 100  #include <klocale.h>