diff options
65 files changed, 246 insertions, 141 deletions
@@ -1,11 +1,16 @@ MPlayer was originally written by Árpád Gereöffy and has been extended and worked on by many more since then, see the AUTHORS file for an (incomplete) -list. You are free to use it under the terms of the GNU General Public License, -as described in the LICENSE file. +list. MPlayer as a whole is copyrighted by the MPlayer team. Individual +copyright notices can be found in file headers. -MPlayer as a whole is copyrighted by the MPlayer team. Individual copyright -notices can be found in the file headers. Furthermore, MPlayer includes code -from several external sources: +Most files in MPlayer are licensed under the GNU General Public License, +version 2 with an explicit "or later" clause or a compatible license. An +exception is the file libmpdemux/demux_ty_osd.c, which is version 2 only. +Thus MPlayer as a whole can be redistributed under the terms of the GNU +General Public License, version 2, see the LICENSE file for details. + +MPlayer includes code from several external sources. General information and +license details are listed below: Name: FFmpeg Version: Subversion HEAD @@ -712,6 +712,7 @@ DIRS = . \ loader \ loader/dshow \ loader/dmo \ + loader/wine \ mp3lib \ osdep \ stream \ @@ -803,7 +804,7 @@ libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_ libdvdread4/%: CFLAGS := -Ilibdvdread4 -D__USE_UNIX98 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS) libfaad2/%: CFLAGS := -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS) -loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER) +loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER) #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN) @@ -815,11 +816,11 @@ tremor/%: CFLAGS += $(CFLAGS_TREMOR_LOW) vidix/%: CFLAGS += $(CFLAGS_DHAHELPER) $(CFLAGS_SVGALIB_HELPER) -VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_vendor_ids.h \ +VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ vidix/pci_vendors.h $(VIDIX_PCI_FILES): vidix/pci_db2c.awk vidix/pci.db - $^ $(VIDIX_PCIDB) + awk -f $^ $(VIDIX_PCIDB) VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d)) VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) diff --git a/fmt-conversion.h b/fmt-conversion.h index f1e44ffe2a..a4ee820353 100644 --- a/fmt-conversion.h +++ b/fmt-conversion.h @@ -1,6 +1,7 @@ #ifndef MPLAYER_FMT_CONVERSION_H #define MPLAYER_FMT_CONVERSION_H +#include "config.h" #include "libavutil/avutil.h" enum PixelFormat imgfmt2pixfmt(int fmt); diff --git a/libvo/csputils.c b/libvo/csputils.c index 6f69ec4212..e842592b1f 100644 --- a/libvo/csputils.c +++ b/libvo/csputils.c @@ -64,7 +64,6 @@ void mp_get_yuv2rgb_coeffs(struct mp_csp_params *params, float yuv2rgb[3][4]) { const float (*uv_coeffs)[3]; const float *level_adjust; static const float yuv_pc_level_adjust[4] = {-16 / 255.0, -128 / 255.0, -128 / 255.0, 1.164}; - static const float yuv_tv_level_adjust[4] = {0, -128 / 255.0, -128 / 255.0, 0}; static const float xyz_level_adjust[4] = {0, 0, 0, 0}; static const float uv_coeffs_table[MP_CSP_COUNT][3][3] = { [MP_CSP_DEFAULT] = { diff --git a/libvo/font_load.h b/libvo/font_load.h index 4776ff135d..7efe067aaf 100644 --- a/libvo/font_load.h +++ b/libvo/font_load.h @@ -19,6 +19,8 @@ #ifndef MPLAYER_FONT_LOAD_H #define MPLAYER_FONT_LOAD_H +#include "config.h" + #ifdef CONFIG_FREETYPE #include <ft2build.h> #include FT_FREETYPE_H diff --git a/libvo/matrixview.c b/libvo/matrixview.c index 5b80984de4..de1e1ccf18 100644 --- a/libvo/matrixview.c +++ b/libvo/matrixview.c @@ -12,7 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., + * with MatrixView; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ diff --git a/libvo/matrixview.h b/libvo/matrixview.h index d96597c243..5081aa79e7 100644 --- a/libvo/matrixview.h +++ b/libvo/matrixview.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_MATRIXVIEW_H #define MPLAYER_MATRIXVIEW_H diff --git a/libvo/matrixview_font.h b/libvo/matrixview_font.h index 753e9344a2..b12e8bbe8b 100644 --- a/libvo/matrixview_font.h +++ b/libvo/matrixview_font.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_MATRIXVIEW_FONT_H #define MPLAYER_MATRIXVIEW_FONT_H diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 7f53a4c05c..677ee189db 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -19,6 +19,7 @@ #ifndef MPLAYER_X11_COMMON_H #define MPLAYER_X11_COMMON_H +#include <stdint.h> #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/loader/dmo/DMO_AudioDecoder.c b/loader/dmo/DMO_AudioDecoder.c index 1b08757349..55a597b2d7 100644 --- a/loader/dmo/DMO_AudioDecoder.c +++ b/loader/dmo/DMO_AudioDecoder.c @@ -5,9 +5,9 @@ *********************************************************/ #include "config.h" -#include "dshow/libwin32.h" +#include "loader/dshow/libwin32.h" #ifdef WIN32_LOADER -#include "ldt_keeper.h" +#include "loader/ldt_keeper.h" #endif #include "DMO_Filter.h" diff --git a/loader/dmo/DMO_AudioDecoder.h b/loader/dmo/DMO_AudioDecoder.h index b4b3dc66e9..d7d0035c84 100644 --- a/loader/dmo/DMO_AudioDecoder.h +++ b/loader/dmo/DMO_AudioDecoder.h @@ -1,6 +1,9 @@ #ifndef MPLAYER_DMO_AUDIODECODER_H #define MPLAYER_DMO_AUDIODECODER_H +#include "loader/com.h" +#include "loader/wine/mmreg.h" + typedef struct DMO_AudioDecoder DMO_AudioDecoder; //DMO_AudioDecoder * DMO_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf); diff --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c index d5a56ebefd..db0cd4c995 100644 --- a/loader/dmo/DMO_VideoDecoder.c +++ b/loader/dmo/DMO_VideoDecoder.c @@ -5,14 +5,14 @@ *********************************************************/ #include "config.h" -#include "dshow/guids.h" -#include "dshow/interfaces.h" -#include "registry.h" +#include "loader/dshow/guids.h" +#include "loader/dshow/interfaces.h" +#include "loader/registry.h" #ifdef WIN32_LOADER -#include "ldt_keeper.h" +#include "loader/ldt_keeper.h" #endif -#include "dshow/libwin32.h" +#include "loader/dshow/libwin32.h" #include "DMO_Filter.h" #include "DMO_VideoDecoder.h" @@ -33,7 +33,7 @@ struct DMO_VideoDecoder //#include "DMO_VideoDecoder.h" -#include "wine/winerror.h" +#include "loader/wine/winerror.h" #include <unistd.h> #include <fcntl.h> diff --git a/loader/dmo/DMO_VideoDecoder.h b/loader/dmo/DMO_VideoDecoder.h index 9e6269be22..77af6ded09 100644 --- a/loader/dmo/DMO_VideoDecoder.h +++ b/loader/dmo/DMO_VideoDecoder.h @@ -1,6 +1,9 @@ #ifndef MPLAYER_DMO_VIDEODECODER_H #define MPLAYER_DMO_VIDEODECODER_H +#include "loader/com.h" +#include "loader/wine/vfw.h" + typedef struct DMO_VideoDecoder DMO_VideoDecoder; int DMO_VideoDecoder_GetCapabilities(DMO_VideoDecoder *this); diff --git a/loader/dmo/buffer.c b/loader/dmo/buffer.c index 0a74fe6c8a..70883b9abe 100644 --- a/loader/dmo/buffer.c +++ b/loader/dmo/buffer.c @@ -1,7 +1,7 @@ #include "DMO_Filter.h" -#include "wine/winerror.h" -#include "wine/windef.h" +#include "loader/wine/winerror.h" +#include "loader/wine/windef.h" #include <stdio.h> #include <string.h> diff --git a/loader/dmo/dmo.c b/loader/dmo/dmo.c index 0e4d2a45e4..f8898efcb5 100644 --- a/loader/dmo/dmo.c +++ b/loader/dmo/dmo.c @@ -5,12 +5,12 @@ #include "config.h" #include "DMO_Filter.h" -#include "drv.h" -#include "com.h" +#include "loader/drv.h" +#include "loader/com.h" #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "win32.h" // printf macro +#include "loader/win32.h" // printf macro void trapbug(void); typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**); diff --git a/loader/dmo/dmo.h b/loader/dmo/dmo.h index b6eeb7410e..dc96bb3326 100644 --- a/loader/dmo/dmo.h +++ b/loader/dmo/dmo.h @@ -9,8 +9,8 @@ * */ -#include "dshow/iunk.h" -#include "dshow/guids.h" +#include "loader/dshow/iunk.h" +#include "loader/dshow/guids.h" typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE; diff --git a/loader/dmo/dmo_guids.h b/loader/dmo/dmo_guids.h index 51e93c9a2c..084c501c5a 100644 --- a/loader/dmo/dmo_guids.h +++ b/loader/dmo/dmo_guids.h @@ -1,7 +1,7 @@ #ifndef MPLAYER_DMO_GUIDS_H #define MPLAYER_DMO_GUIDS_H -#include "dshow/guids.h" +#include "loader/dshow/guids.h" extern const GUID IID_IMediaBuffer; extern const GUID IID_IMediaObject; diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c index b18b646160..cfa2fcb5a2 100644 --- a/loader/dshow/DS_AudioDecoder.c +++ b/loader/dshow/DS_AudioDecoder.c @@ -21,7 +21,7 @@ struct DS_AudioDecoder #include "DS_AudioDecoder.h" #ifdef WIN32_LOADER -#include "ldt_keeper.h" +#include "loader/ldt_keeper.h" #endif #include <string.h> diff --git a/loader/dshow/DS_AudioDecoder.h b/loader/dshow/DS_AudioDecoder.h index 0b09d3b19c..157993cda3 100644 --- a/loader/dshow/DS_AudioDecoder.h +++ b/loader/dshow/DS_AudioDecoder.h @@ -1,6 +1,9 @@ #ifndef MPLAYER_DS_AUDIODECODER_H #define MPLAYER_DS_AUDIODECODER_H +#include "loader/com.h" +#include "loader/wine/mmreg.h" + typedef struct DS_AudioDecoder DS_AudioDecoder; //DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf); diff --git a/loader/dshow/DS_Filter.c b/loader/dshow/DS_Filter.c index 5fb1ec73dc..42b47b8626 100644 --- a/loader/dshow/DS_Filter.c +++ b/loader/dshow/DS_Filter.c @@ -5,12 +5,12 @@ #include "config.h" #include "DS_Filter.h" -#include "drv.h" -#include "com.h" +#include "loader/drv.h" +#include "loader/com.h" #include <stdio.h> #include <string.h> #include <stdlib.h> -#include "win32.h" // printf macro +#include "loader/win32.h" // printf macro typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**); diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c index e691bb5dc5..c0441ceacb 100644 --- a/loader/dshow/DS_VideoDecoder.c +++ b/loader/dshow/DS_VideoDecoder.c @@ -7,7 +7,7 @@ #include "config.h" #include "guids.h" #include "interfaces.h" -#include "registry.h" +#include "loader/registry.h" #include "libwin32.h" #include "DS_Filter.h" @@ -30,9 +30,9 @@ static SampleProcUserData sampleProcData; #include "DS_VideoDecoder.h" -#include "wine/winerror.h" +#include "loader/wine/winerror.h" #ifdef WIN32_LOADER -#include "ldt_keeper.h" +#include "loader/ldt_keeper.h" #endif #include <unistd.h> diff --git a/loader/dshow/DS_VideoDecoder.h b/loader/dshow/DS_VideoDecoder.h index b686554b89..f1a0898868 100644 --- a/loader/dshow/DS_VideoDecoder.h +++ b/loader/dshow/DS_VideoDecoder.h @@ -1,6 +1,9 @@ #ifndef MPLAYER_DS_VIDEODECODER_H #define MPLAYER_DS_VIDEODECODER_H +#include "loader/com.h" +#include "loader/wine/vfw.h" + typedef struct DS_VideoDecoder DS_VideoDecoder; int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this); diff --git a/loader/dshow/allocator.c b/loader/dshow/allocator.c index 3e0deabceb..8ead279a37 100644 --- a/loader/dshow/allocator.c +++ b/loader/dshow/allocator.c @@ -5,8 +5,8 @@ #include "config.h" #include "allocator.h" -#include "com.h" -#include "wine/winerror.h" +#include "loader/com.h" +#include "loader/wine/winerror.h" #include <stdio.h> #include <stdlib.h> diff --git a/loader/dshow/cmediasample.c b/loader/dshow/cmediasample.c index 98a864b3be..c594bae787 100644 --- a/loader/dshow/cmediasample.c +++ b/loader/dshow/cmediasample.c @@ -5,7 +5,7 @@ #include "cmediasample.h" #include "mediatype.h" -#include "wine/winerror.h" +#include "loader/wine/winerror.h" #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/loader/dshow/guids.h b/loader/dshow/guids.h index 5666ec3041..5bf335f907 100644 --- a/loader/dshow/guids.h +++ b/loader/dshow/guids.h @@ -7,13 +7,13 @@ under MinGW */ #ifndef GUID_DEFINED -#include "com.h" +#include "loader/com.h" #endif #ifndef VFWAPI -#include "wine/module.h" -#include "wine/windef.h" -#include "wine/vfw.h" +#include "loader/wine/module.h" +#include "loader/wine/windef.h" +#include "loader/wine/vfw.h" #endif #include "mediatype.h" diff --git a/loader/dshow/inputpin.c b/loader/dshow/inputpin.c index 37d9f758fa..5c9b832f7a 100644 --- a/loader/dshow/inputpin.c +++ b/loader/dshow/inputpin.c @@ -5,7 +5,7 @@ #include "inputpin.h" #include "mediatype.h" -#include "wine/winerror.h" +#include "loader/wine/winerror.h" #include <string.h> #include <stdio.h> #include <stdlib.h> diff --git a/loader/dshow/interfaces.h b/loader/dshow/interfaces.h index 8cac9712b8..5c927a55be 100644 --- a/loader/dshow/interfaces.h +++ b/loader/dshow/interfaces.h @@ -8,7 +8,7 @@ */ #include "iunk.h" -#include "com.h" +#include "loader/com.h" /* Sh*t. MSVC++ and g++ use different methods of storing vtables. */ diff --git a/loader/dshow/libwin32.h b/loader/dshow/libwin32.h index 70d5e0f006..dd25c31941 100644 --- a/loader/dshow/libwin32.h +++ b/loader/dshow/libwin32.h @@ -6,10 +6,10 @@ #include <inttypes.h> //#define FATAL(a) // you don't need exception - if you want - just fill more code -#include "wine/mmreg.h" -#include "wine/winreg.h" -#include "wine/vfw.h" -#include "com.h" +#include "loader/wine/mmreg.h" +#include "loader/wine/winreg.h" +#include "loader/wine/vfw.h" +#include "loader/com.h" typedef uint32_t fourcc_t; diff --git a/loader/dshow/mediatype.c b/loader/dshow/mediatype.c index d6597fa767..873c303477 100644 --- a/loader/dshow/mediatype.c +++ b/loader/dshow/mediatype.c |