diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-04 00:41:50 +0000 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-04 00:41:50 +0000 |
commit | 8ca383c4603cc8572684314ae53d8276664c705f (patch) | |
tree | ba297bbf8c4728b5571a24312aa8cfd411ea943e /src | |
parent | 447b0fe8cf73914b19dd376a8663939e0414225a (diff) | |
parent | c66abf19167b237f526e7607639ffed1a0acf467 (diff) | |
download | xine-lib-8ca383c4603cc8572684314ae53d8276664c705f.tar.gz xine-lib-8ca383c4603cc8572684314ae53d8276664c705f.tar.bz2 |
Merge.
Diffstat (limited to 'src')
-rw-r--r-- | src/combined/ffmpeg/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am index 773353096..3ae65f115 100644 --- a/src/combined/ffmpeg/Makefile.am +++ b/src/combined/ffmpeg/Makefile.am @@ -17,6 +17,8 @@ DISTCLEANFILES = $(ff_generated) 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 |