Attachment #162318 for bug #218088

Lines 62-68 Link Here

(-)configure.in.old (-1 / +1 lines)
62	AC_SUBST(AVCODEC_LIBS)	62	AC_SUBST(AVCODEC_LIBS)
63	AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])	63	AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
64	if test x$HAVE_AVCODEC = xyes; then	64	if test x$HAVE_AVCODEC = xyes; then
65	AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no])	65	AC_CHECK_HEADERS([ffmpeg/avcodec.h], , [AC_CHECK_HEADERS([libavcodec/avcodec.h], , [HAVE_AVCODEC=no])])
66	fi	66	fi
67	AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes)	67	AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes)
68	CFLAGS="$CFLAGS_saved"	68	CFLAGS="$CFLAGS_saved"

Lines 16-25 Link Here

(-)rate-lavc/rate_lavcrate.c.old (+5 lines)
16	* Lesser General Public License for more details.	16	* Lesser General Public License for more details.
17	*/	17	*/
18		18
		19	#include "config.h"
19	#include <stdio.h>	20	#include <stdio.h>
20	#include <alsa/asoundlib.h>	21	#include <alsa/asoundlib.h>
21	#include <alsa/pcm_rate.h>	22	#include <alsa/pcm_rate.h>
		23	#ifdef HAVE_FFMPEG_AVCODEC_H
22	#include <ffmpeg/avcodec.h>	24	#include <ffmpeg/avcodec.h>
		25	#elif defined(HAVE_LIBAVCODEC_AVCODEC_H)
		26	#include <libavcodec/avcodec.h>
		27	#endif
23	#include "gcd.h"	28	#include "gcd.h"
24		29
25	static int filter_size = 16;	30	static int filter_size = 16;

Lines 18-23 Link Here

(-)a52/pcm_a52.c.old (+5 lines)
18	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	18	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19	*/	19	*/
20		20
		21	#include "config.h"
21	#include <stdio.h>	22	#include <stdio.h>
22	#include <string.h>	23	#include <string.h>
23	#define __USE_XOPEN	24	#define __USE_XOPEN
Lines 25-31 Link Here
25	#include <alsa/asoundlib.h>	26	#include <alsa/asoundlib.h>
26	#include <alsa/pcm_external.h>	27	#include <alsa/pcm_external.h>
27	#include <alsa/pcm_plugin.h>	28	#include <alsa/pcm_plugin.h>
		29	#ifdef HAVE_FFMPEG_AVCODEC_H
28	#include <ffmpeg/avcodec.h>	30	#include <ffmpeg/avcodec.h>
		31	#elif defined(HAVE_LIBAVCODEC_AVCODEC_H)
		32	#include <libavcodec/avcodec.h>
		33	#endif
29		34
30	struct a52_ctx {	35	struct a52_ctx {
31	snd_pcm_ioplug_t io;	36	snd_pcm_ioplug_t io;

Return to bug 218088