[xine-cvs] HG: xine-lib-1.2: Merge.

[Darren S. <li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1328316110 0
# Node ID 0941efa8a9d38432e12e4a226c0f1d6effd10724
# Branch  default
# Parent  d0bbeb4034c11629012193b4679b181c3354b1c8
# Parent  db30db09975f97b922f17b29f940001530473931
Merge.

diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am
--- a/src/combined/ffmpeg/Makefile.am
+++ b/src/combined/ffmpeg/Makefile.am
@@ -17,6 +17,8 @@
 
 EXTRA_DIST = xine_video.list xine_audio.list mkcodeclist.pl
 
+noinst_HEADERS = ffmpeg_compat.h
+
 xineplug_decode_ff_la_SOURCES = ffmpeg_decoder.c ff_audio_decoder.c ff_video_decoder.c \
                                 ff_mpeg_parser.c ffmpeg_decoder.h ff_mpeg_parser.h