Merge from 1.1.

--HG--
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h

3 files changed, 16 insertions, 3 deletions

diff --git a/src/combined/ffmpeg/ff_dvaudio_decoder.c b/src/combined/ffmpeg/ff_dvaudio_decoder.c
index aced7f5bb..293f35e7c 100644
--- a/src/combined/ffmpeg/ff_dvaudio_decoder.c
+++ b/src/combined/ffmpeg/ff_dvaudio_decoder.c
@@ -52,7 +52,12 @@
 #  undef uint64_t
 #endif
 
-#include <avcodec.h>
+#ifdef HAVE_FFMPEG_AVCODEC_H
+#  include <avcodec.h>
+#else
+#  include <libavcodec/avcodec.h>
+#endif
+
 #include <dvdata.h> /* This is not installed by FFmpeg, its usage has to be cleared up */
 
 #ifdef _MSC_VER
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index b7a5338fc..845ef5d79 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -47,7 +47,11 @@
 #include "ffmpeg_decoder.h"
 #include "ff_mpeg_parser.h"
 
-#include <postprocess.h>
+#ifdef HAVE_FFMPEG_AVCODEC_H
+#  include <postprocess.h>
+#else
+#  include <libpostproc/postprocess.h>
+#endif
 
 #define VIDEOBUFSIZE        (128*1024)
 #define SLICE_BUFFER_SIZE   (1194*1024)
diff --git a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h
index bfe71a6b1..adf0908dd 100644
--- a/src/combined/ffmpeg/ffmpeg_decoder.h
+++ b/src/combined/ffmpeg/ffmpeg_decoder.h
@@ -25,7 +25,11 @@
 #include "config.h"
 #endif
 
-#include <avcodec.h>
+#ifdef HAVE_FFMPEG_AVCODEC_H
+#  include <avcodec.h>
+#else
+#  include <libavcodec/avcodec.h>
+#endif
 
 typedef struct ff_codec_s {
   uint32_t          type;