From 567fb2d4ff1270a3c425688bd410edadc12428a2 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 26 Aug 2008 17:06:43 +0200
Subject: Fix build with recent ffmpeg

Add a check of pkgconfig libavcodec in configure script.
Since the header file was moved to <libavcodec/*>, its location has
to be checked in configure, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 a52/Makefile.am | 3 ++-
 a52/pcm_a52.c   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'a52')

diff --git a/a52/Makefile.am b/a52/Makefile.am
index 30c5c51..4929c53 100644
--- a/a52/Makefile.am
+++ b/a52/Makefile.am
@@ -2,7 +2,8 @@ asound_module_pcm_a52_LTLIBRARIES = libasound_module_pcm_a52.la
 
 asound_module_pcm_a52dir = @ALSA_PLUGIN_DIR@
 
-AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@
+AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@ \
+	-DAVCODEC_HEADER="@AVCODEC_HEADER@"
 AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined
 
 libasound_module_pcm_a52_la_SOURCES = pcm_a52.c
diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
index 97acfe7..1abfdaa 100644
--- a/a52/pcm_a52.c
+++ b/a52/pcm_a52.c
@@ -25,7 +25,7 @@
 #include <alsa/asoundlib.h>
 #include <alsa/pcm_external.h>
 #include <alsa/pcm_plugin.h>
-#include <ffmpeg/avcodec.h>
+#include AVCODEC_HEADER
 
 struct a52_ctx {
 	snd_pcm_ioplug_t io;
-- 
cgit