current/SOURCES/0006-fixed-build-with-recent-external-ffmpeg-fixes-11259.patch

From 2ead30c5ccd66871585e04283dc84f75390eb9dd Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@xbmc.org>
Date: Mon, 21 Mar 2011 14:22:03 +0200
Subject: [PATCH 06/12] fixed: build with recent external ffmpeg (fixes
 #11259)

Libavcore was merged to libavutil in FFmpeg commit 737eb5976f6a on
2011-02-15. Fix build with an external FFmpeg where that is the case.

Tested by Paul Menzel <paulepanter@users.sourceforge.net>.

(partial cherry-pick of 453689b5cba4b6da8a5df1e43cb9958623d46613)
---
 configure.in                             |    3 +++
 xbmc/cores/dvdplayer/Codecs/DllAvCodec.h |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/configure.in b/configure.in
index 2a0a964..16ce014 100644
--- a/configure.in
+++ b/configure.in
@@ -855,6 +855,9 @@ if test "$use_external_ffmpeg" = "yes"; then
   [AC_CHECK_HEADERS([ffmpeg/avcodec.h ffmpeg/avformat.h ffmpeg/avutil.h postproc/postprocess.h ffmpeg/swscale.h],,
   [AC_MSG_ERROR($missing_headers)])])
 
+  # optional
+  AC_CHECK_HEADERS([libavutil/samplefmt.h])
+
   # We'll support the use of rgb2rgb.h if it exists.
   AC_CHECK_HEADERS([libswscale/rgb2rgb.h],,)
   AC_CHECK_HEADERS([ffmpeg/rgb2rgb.h],,)
diff --git a/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h b/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h
index 3b11c41..2394c20 100644
--- a/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h
+++ b/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h
@@ -55,6 +55,10 @@ extern "C" {
       #include <ffmpeg/avformat.h>
     #endif
   #endif
+  #ifdef HAVE_LIBAVUTIL_SAMPLEFMT_H
+    #include <libavutil/audioconvert.h>
+    #include <libavutil/samplefmt.h>
+  #endif
   /* We'll just inlude this header in our project for now */
   #include "xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/audioconvert.h"
   #include "xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/crc.h"
-- 
1.7.4.4

1	From 2ead30c5ccd66871585e04283dc84f75390eb9dd Mon Sep 17 00:00:00 2001
2	From: Anssi Hannula <anssi@xbmc.org>
3	Date: Mon, 21 Mar 2011 14:22:03 +0200
4	Subject: [PATCH 06/12] fixed: build with recent external ffmpeg (fixes
5	#11259)
6
7	Libavcore was merged to libavutil in FFmpeg commit 737eb5976f6a on
8	2011-02-15. Fix build with an external FFmpeg where that is the case.
9
10	Tested by Paul Menzel <paulepanter@users.sourceforge.net>.
11
12	(partial cherry-pick of 453689b5cba4b6da8a5df1e43cb9958623d46613)
13	---
14	configure.in \| 3 +++
15	xbmc/cores/dvdplayer/Codecs/DllAvCodec.h \| 4 ++++
16	2 files changed, 7 insertions(+), 0 deletions(-)
17
18	diff --git a/configure.in b/configure.in
19	index 2a0a964..16ce014 100644
20	--- a/configure.in
21	+++ b/configure.in
22	@@ -855,6 +855,9 @@ if test "$use_external_ffmpeg" = "yes"; then
23	[AC_CHECK_HEADERS([ffmpeg/avcodec.h ffmpeg/avformat.h ffmpeg/avutil.h postproc/postprocess.h ffmpeg/swscale.h],,
24	[AC_MSG_ERROR($missing_headers)])])
25
26	+ # optional
27	+ AC_CHECK_HEADERS([libavutil/samplefmt.h])
28	+
29	# We'll support the use of rgb2rgb.h if it exists.
30	AC_CHECK_HEADERS([libswscale/rgb2rgb.h],,)
31	AC_CHECK_HEADERS([ffmpeg/rgb2rgb.h],,)
32	diff --git a/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h b/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h
33	index 3b11c41..2394c20 100644
34	--- a/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h
35	+++ b/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h
36	@@ -55,6 +55,10 @@ extern "C" {
37	#include <ffmpeg/avformat.h>
38	#endif
39	#endif
40	+ #ifdef HAVE_LIBAVUTIL_SAMPLEFMT_H
41	+ #include <libavutil/audioconvert.h>
42	+ #include <libavutil/samplefmt.h>
43	+ #endif
44	/* We'll just inlude this header in our project for now */
45	#include "xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/audioconvert.h"
46	#include "xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/crc.h"
47	--
48	1.7.4.4
49