diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-20 16:38:25 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-20 16:38:25 +0100 |
| commit | 3ce0de86ad429962ab581b9af762aa5dc9d3f156 (patch) | |
| tree | 4640aaa3ece95b03f3ee7ef74e5162005347753a /src/libw32dll | |
| parent | 17c9a01cbafd5ff0e6645f96f8ac084fbf239e4d (diff) | |
| parent | f3974e74f2f1548bf07604fddfa60cf75b2fda57 (diff) | |
| download | xine-lib-3ce0de86ad429962ab581b9af762aa5dc9d3f156.tar.gz xine-lib-3ce0de86ad429962ab581b9af762aa5dc9d3f156.tar.bz2 | |
Merge the avutil branch; port the "raw" video output plugin.
--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c
rename : src/combined/ffmpeg/ffmpeg_encoder.c => src/dxr3/ffmpeg_encoder.c
Diffstat (limited to 'src/libw32dll')
| -rw-r--r-- | src/libw32dll/wine/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index 7036716b1..170f31086 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) @W32_NO_OPTIMIZE@ \ -fno-omit-frame-pointer -fno-inline-functions -fno-rename-registers AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -I$(srcdir)/.. -D__WINE__ \ -Ddbg_printf=__vprintf -DTRACE=__vprintf \ - -I$(top_srcdir)/src/xine-utils + -I$(top_srcdir)/src/xine-utils EXTRA_DIST = stubs.s wrapper.S |