33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
|
diff -uNr xine-lib-1.2.1.orig/m4/decoders.m4 xine-lib-1.2.1/m4/decoders.m4
|
||
|
|
--- xine-lib-1.2.1.orig/m4/decoders.m4 2012-02-04 01:41:43.000000000 +0100
|
||
|
|
+++ xine-lib-1.2.1/m4/decoders.m4 2012-05-21 22:46:39.470861703 +0200
|
||
|
|
@@ -85,9 +85,7 @@
|
||
|
|
AM_CONDITIONAL([WITH_EXTERNAL_FAAD], [test x"$have_external_faad" = x"yes"])
|
||
|
|
|
||
|
|
dnl ffmpeg external version required
|
||
|
|
- PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.68.0])
|
||
|
|
PKG_CHECK_MODULES([AVUTIL], [libavutil >= 49.6.0])
|
||
|
|
- PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc])
|
||
|
|
AC_DEFINE([HAVE_FFMPEG], 1, [Define this if you have ffmpeg library])
|
||
|
|
|
||
|
|
dnl Check presence of ffmpeg/avutil.h to see if it's old or new
|
||
|
|
diff -uNr xine-lib-1.2.1.orig/src/audio_dec/Makefile.am xine-lib-1.2.1/src/audio_dec/Makefile.am
|
||
|
|
--- xine-lib-1.2.1.orig/src/audio_dec/Makefile.am 2012-02-04 01:41:43.000000000 +0100
|
||
|
|
+++ xine-lib-1.2.1/src/audio_dec/Makefile.am 2012-05-22 20:37:48.863941984 +0200
|
||
|
|
@@ -49,7 +49,6 @@
|
||
|
|
xineplug_LTLIBRARIES = \
|
||
|
|
xineplug_decode_gsm610.la \
|
||
|
|
xineplug_decode_lpcm.la \
|
||
|
|
- xineplug_decode_dvaudio.la \
|
||
|
|
$(musepack_module) \
|
||
|
|
$(dts_module) \
|
||
|
|
$(mad_module) \
|
||
|
|
@@ -87,7 +86,3 @@
|
||
|
|
xineplug_decode_faad_la_DEPENDENCIES = $(FAAD_DEPS)
|
||
|
|
xineplug_decode_faad_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(FAAD_LIBS) -lm
|
||
|
|
xineplug_decode_faad_la_CFLAGS = $(FAAD_CFLAGS)
|
||
|
|
-
|
||
|
|
-xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c
|
||
|
|
-xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
|
||
|
|
-xineplug_decode_dvaudio_la_CPPFLAGS = $(AM_CPPFLAGS) $(FFMPEG_CFLAGS)
|