diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-23 00:37:48 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-23 00:37:48 +0100 |
| commit | 1dda55c79b90c27303628a42c7ad8d948d613146 (patch) | |
| tree | fad68e0e7513130582e28cf05d4ceff413f5343c /configure.ac | |
| parent | d23cc6dbac6f2b212d99453fddc0f20ccd178ab4 (diff) | |
| parent | dca820a7cb6f1087f6d29482a1ee6d4916fc9f71 (diff) | |
| download | xine-lib-1dda55c79b90c27303628a42c7ad8d948d613146.tar.gz xine-lib-1dda55c79b90c27303628a42c7ad8d948d613146.tar.bz2 | |
Merge from 1.2 main branch.
--HG--
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am
rename : src/libxineadec/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c
rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/ff_dvdata.h => src/combined/ffmpeg/ff_dvdata.h
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
rename : src/libmpeg2/decode.c => src/video_dec/libmpeg2/decode.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 9c6c52302..af49a2746 100644 --- a/configure.ac +++ b/configure.ac @@ -1152,7 +1152,8 @@ contrib/nosefart/Makefile contrib/vidix/Makefile contrib/vidix/drivers/Makefile include/Makefile -include/xine.h +include/xine/Makefile +include/xine/version.h lib/Makefile m4/Makefile m4/gettext/Makefile @@ -1166,7 +1167,9 @@ misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile +src/audio_dec/Makefile src/combined/Makefile +src/combined/ffmpeg/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile @@ -1174,21 +1177,12 @@ src/input/libdvdnav/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile -src/libffmpeg/Makefile -src/libmpeg2/Makefile -src/libspudec/Makefile -src/libspucc/Makefile -src/libspucmml/Makefile -src/libspudvb/Makefile -src/libsputext/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile -src/libxinevdec/Makefile -src/libxineadec/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile @@ -1198,6 +1192,9 @@ src/post/visualizations/Makefile src/post/audio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile +src/spu_dec/Makefile +src/video_dec/Makefile +src/video_dec/libmpeg2/Makefile src/video_out/Makefile src/video_out/macosx/Makefile src/xine-utils/Makefile |