From 12abc254d54f06d784025404acedac4487ee45a7 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 30 Jan 2010 21:38:05 +0000 Subject: [PATCH 01/11] stream/rtp.h appears not to originate from dvbstream. In any case it is completely trivial and non-copyrightable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30465 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Copyright | 2 +- stream/rtp.h | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Copyright b/Copyright index 7a1485a720..24261f58d2 100644 --- a/Copyright +++ b/Copyright @@ -128,7 +128,7 @@ License: GNU General Public License Name: dvbstream Version: 0.4.3-pre3 (CVS checkout) URL: http://sourceforge.net/projects/dvbtools/ -Directory: stream/dvbin.h stream/rtp.[ch] stream/stream_dvb.c +Directory: stream/dvbin.h stream/rtp.c stream/stream_dvb.c Copyright: 2001-2002 Dave Chapman License: GNU General Public License diff --git a/stream/rtp.h b/stream/rtp.h index d35ae4753d..f2ba3cbd81 100644 --- a/stream/rtp.h +++ b/stream/rtp.h @@ -1,8 +1,19 @@ -/* Imported from the dvbstream project +/* + * This file is part of MPlayer. * - * Modified for use with MPlayer, for details see the changelog at - * http://svn.mplayerhq.hu/mplayer/trunk/ - * $Id$ + * 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_RTP_H From 9058c03d7acb39444647d9f2d02732a8d6b8b82a Mon Sep 17 00:00:00 2001 From: stefano Date: Sat, 30 Jan 2010 21:56:33 +0000 Subject: [PATCH 02/11] Use a consistent convention for the names of the internal wrapper functions. Improve readability. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30466 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 60 ++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a75b84c99f..bc9a60ac7e 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1267,7 +1267,7 @@ SwsFunc ff_getSwsFunc(SwsContext *c) #endif //!CONFIG_RUNTIME_CPUDETECT } -static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int planarToNv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dstParam[], int dstStride[]) { uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY; @@ -1293,7 +1293,7 @@ static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid return srcSliceH; } -static int PlanarToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int planarToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dstParam[], int dstStride[]) { uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY; @@ -1303,7 +1303,7 @@ static int PlanarToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid return srcSliceH; } -static int PlanarToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int planarToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dstParam[], int dstStride[]) { uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY; @@ -1313,7 +1313,7 @@ static int PlanarToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStrid return srcSliceH; } -static int YUV422PToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dstParam[], int dstStride[]) { uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY; @@ -1323,7 +1323,7 @@ static int YUV422PToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStri return srcSliceH; } -static int YUV422PToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dstParam[], int dstStride[]) { uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY; @@ -1333,7 +1333,7 @@ static int YUV422PToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStri return srcSliceH; } -static int YUYV2YUV420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dstParam[], int dstStride[]) { uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY; @@ -1348,7 +1348,7 @@ static int YUYV2YUV420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride return srcSliceH; } -static int YUYV2YUV422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dstParam[], int dstStride[]) { uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY; @@ -1360,7 +1360,7 @@ static int YUYV2YUV422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride return srcSliceH; } -static int UYVY2YUV420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dstParam[], int dstStride[]) { uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY; @@ -1375,7 +1375,7 @@ static int UYVY2YUV420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride return srcSliceH; } -static int UYVY2YUV422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dstParam[], int dstStride[]) { uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY; @@ -1387,7 +1387,7 @@ static int UYVY2YUV422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride return srcSliceH; } -static int pal2rgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) { const enum PixelFormat srcFormat= c->srcFormat; @@ -1424,7 +1424,7 @@ static int pal2rgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], } /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */ -static int rgb2rgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) { const enum PixelFormat srcFormat= c->srcFormat; @@ -1498,7 +1498,7 @@ static int rgb2rgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], return srcSliceH; } -static int bgr24toyv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) { rgb24toyv12( @@ -1513,7 +1513,7 @@ static int bgr24toyv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride return srcSliceH; } -static int yvu9toyv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) { int i; @@ -1549,7 +1549,7 @@ static int yvu9toyv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[ } /* unscaled copy like stuff (assumes nearly identical formats) */ -static int packedCopy(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) { if (dstStride[0]==srcStride[0] && srcStride[0] > 0) @@ -1574,7 +1574,7 @@ static int packedCopy(SwsContext *c, const uint8_t* src[], int srcStride[], int return srcSliceH; } -static int planarCopy(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) { int plane, i, j; @@ -1665,7 +1665,7 @@ void ff_get_unscaled_swscale(SwsContext *c) /* yv12_to_nv12 */ if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) && (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21)) { - c->swScale= PlanarToNV12Wrapper; + c->swScale= planarToNv12Wrapper; } /* yuv2bgr */ if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P || srcFormat==PIX_FMT_YUVA420P) && isAnyRGB(dstFormat) @@ -1674,12 +1674,12 @@ void ff_get_unscaled_swscale(SwsContext *c) } if (srcFormat==PIX_FMT_YUV410P && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_BITEXACT)) { - c->swScale= yvu9toyv12Wrapper; + c->swScale= yvu9ToYv12Wrapper; } /* bgr24toYV12 */ if (srcFormat==PIX_FMT_BGR24 && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_ACCURATE_RND)) - c->swScale= bgr24toyv12Wrapper; + c->swScale= bgr24ToYv12Wrapper; /* RGB/BGR -> RGB/BGR (no dither needed forms) */ if ( isAnyRGB(srcFormat) @@ -1697,7 +1697,7 @@ void ff_get_unscaled_swscale(SwsContext *c) && srcFormat != PIX_FMT_RGB48LE && dstFormat != PIX_FMT_RGB48LE && srcFormat != PIX_FMT_RGB48BE && dstFormat != PIX_FMT_RGB48BE && (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)))) - c->swScale= rgb2rgbWrapper; + c->swScale= rgbToRgbWrapper; if ((usePal(srcFormat) && ( dstFormat == PIX_FMT_RGB32 || @@ -1706,13 +1706,13 @@ void ff_get_unscaled_swscale(SwsContext *c) dstFormat == PIX_FMT_BGR32 || dstFormat == PIX_FMT_BGR32_1 || dstFormat == PIX_FMT_BGR24))) - c->swScale= pal2rgbWrapper; + c->swScale= palToRgbWrapper; if (srcFormat == PIX_FMT_YUV422P) { if (dstFormat == PIX_FMT_YUYV422) - c->swScale= YUV422PToYuy2Wrapper; + c->swScale= yuv422pToYuy2Wrapper; else if (dstFormat == PIX_FMT_UYVY422) - c->swScale= YUV422PToUyvyWrapper; + c->swScale= yuv422pToUyvyWrapper; } /* LQ converters if -sws 0 or -sws 4*/ @@ -1720,19 +1720,19 @@ void ff_get_unscaled_swscale(SwsContext *c) /* yv12_to_yuy2 */ if (srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) { if (dstFormat == PIX_FMT_YUYV422) - c->swScale= PlanarToYuy2Wrapper; + c->swScale= planarToYuy2Wrapper; else if (dstFormat == PIX_FMT_UYVY422) - c->swScale= PlanarToUyvyWrapper; + c->swScale= planarToUyvyWrapper; } } if(srcFormat == PIX_FMT_YUYV422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P)) - c->swScale= YUYV2YUV420Wrapper; + c->swScale= yuyvToYuv420Wrapper; if(srcFormat == PIX_FMT_UYVY422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P)) - c->swScale= UYVY2YUV420Wrapper; + c->swScale= uyvyToYuv420Wrapper; if(srcFormat == PIX_FMT_YUYV422 && dstFormat == PIX_FMT_YUV422P) - c->swScale= YUYV2YUV422Wrapper; + c->swScale= yuyvToYuv422Wrapper; if(srcFormat == PIX_FMT_UYVY422 && dstFormat == PIX_FMT_YUV422P) - c->swScale= UYVY2YUV422Wrapper; + c->swScale= uyvyToYuv422Wrapper; #ifdef COMPILE_ALTIVEC if ((c->flags & SWS_CPU_CAPS_ALTIVEC) && @@ -1760,9 +1760,9 @@ void ff_get_unscaled_swscale(SwsContext *c) && srcFormat != PIX_FMT_NV12 && srcFormat != PIX_FMT_NV21)) { if (isPacked(c->srcFormat)) - c->swScale= packedCopy; + c->swScale= packedCopyWrapper; else /* Planar YUV or gray */ - c->swScale= planarCopy; + c->swScale= planarCopyWrapper; } #if ARCH_BFIN if (flags & SWS_CPU_CAPS_BFIN) From 279a334729671b6768cc8b15ab9a432e0ec23b01 Mon Sep 17 00:00:00 2001 From: stefano Date: Sat, 30 Jan 2010 21:58:09 +0000 Subject: [PATCH 03/11] Reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30467 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index bc9a60ac7e..ff68f344c3 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1388,7 +1388,7 @@ static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid } static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, - int srcSliceH, uint8_t* dst[], int dstStride[]) + int srcSliceH, uint8_t* dst[], int dstStride[]) { const enum PixelFormat srcFormat= c->srcFormat; const enum PixelFormat dstFormat= c->dstFormat; @@ -1425,7 +1425,7 @@ static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */ static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, - int srcSliceH, uint8_t* dst[], int dstStride[]) + int srcSliceH, uint8_t* dst[], int dstStride[]) { const enum PixelFormat srcFormat= c->srcFormat; const enum PixelFormat dstFormat= c->dstFormat; @@ -1550,7 +1550,7 @@ static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[ /* unscaled copy like stuff (assumes nearly identical formats) */ static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, - int srcSliceH, uint8_t* dst[], int dstStride[]) + int srcSliceH, uint8_t* dst[], int dstStride[]) { if (dstStride[0]==srcStride[0] && srcStride[0] > 0) memcpy(dst[0] + dstStride[0]*srcSliceY, src[0], srcSliceH*dstStride[0]); @@ -1575,7 +1575,7 @@ static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[ } static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, - int srcSliceH, uint8_t* dst[], int dstStride[]) + int srcSliceH, uint8_t* dst[], int dstStride[]) { int plane, i, j; for (plane=0; plane<4; plane++) { From 59e26907b64a90e1aeef1615132ad84d291a9c3e Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 30 Jan 2010 22:26:47 +0000 Subject: [PATCH 04/11] Add license header to all files missing it in the stream subdirectory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30468 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/ai_alsa.c | 18 +++++++++++++++ stream/ai_alsa1x.c | 18 +++++++++++++++ stream/ai_oss.c | 18 +++++++++++++++ stream/asf_streaming.c | 18 +++++++++++++++ stream/audio_in.c | 18 +++++++++++++++ stream/audio_in.h | 18 +++++++++++++++ stream/cache2.c | 18 +++++++++++++++ stream/cache2.h | 18 +++++++++++++++ stream/cdd.h | 18 +++++++++++++++ stream/cdinfo.c | 22 +++++++++++++++--- stream/cookies.c | 18 ++++++++++++++- stream/cookies.h | 18 ++++++++++++++- stream/frequencies.c | 18 +++++++++++++++ stream/frequencies.h | 16 +++++++++++++ stream/http.c | 20 +++++++++++++++-- stream/http.h | 20 +++++++++++++++-- stream/network.c | 20 +++++++++++++++-- stream/network.h | 20 +++++++++++++++-- stream/open.c | 17 ++++++++++++++ stream/realrtsp/xbuffer.c | 15 +++++++++++++ stream/realrtsp/xbuffer.h | 15 +++++++++++++ stream/stream.c | 17 ++++++++++++++ stream/stream.h | 18 +++++++++++++++ stream/stream_cdda.c | 18 +++++++++++++++ stream/stream_cddb.c | 20 ++++++++++++++--- stream/stream_cue.c | 20 ++++++++++++++++- stream/stream_dvd.c | 18 ++++++++++++++- stream/stream_dvd.h | 18 +++++++++++++++ stream/stream_dvd_common.c | 18 +++++++++++++++ stream/stream_dvd_common.h | 18 +++++++++++++++ stream/stream_dvdnav.c | 18 +++++++++++++++ stream/stream_dvdnav.h | 18 +++++++++++++++ stream/stream_ffmpeg.c | 18 +++++++++++++++ stream/stream_file.c | 17 ++++++++++++++ stream/stream_ftp.c | 17 ++++++++++++++ stream/stream_live555.c | 17 ++++++++++++++ stream/stream_netstream.h | 17 +++++++++++++- stream/stream_null.c | 17 ++++++++++++++ stream/stream_radio.h | 18 +++++++++++++++ stream/stream_smb.c | 17 ++++++++++++++ stream/stream_vcd.c | 17 ++++++++++++++ stream/tcp.c | 20 +++++++++++++++-- stream/tv.c | 35 ++++++++++++++++++++--------- stream/tvi_bsdbt848.c | 37 +++++++++++++++++++++--------- stream/tvi_def.h | 18 +++++++++++++++ stream/tvi_dshow.h | 18 +++++++++++++++ stream/tvi_dummy.c | 20 +++++++++++++++-- stream/tvi_v4l.c | 46 +++++++++++++++++++++++++------------- stream/url.c | 19 ++++++++++++++-- stream/url.h | 20 +++++++++++++++-- stream/vcd_read.h | 18 +++++++++++++++ stream/vcd_read_darwin.h | 18 +++++++++++++++ stream/vcd_read_fbsd.h | 18 +++++++++++++++ stream/vcd_read_win32.h | 18 +++++++++++++++ 54 files changed, 980 insertions(+), 62 deletions(-) diff --git a/stream/ai_alsa.c b/stream/ai_alsa.c index 4371dd23ba..fb6d7ceb26 100644 --- a/stream/ai_alsa.c +++ b/stream/ai_alsa.c @@ -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. + */ + #include #include #include diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c index 23e0b5d9ef..f5cece4499 100644 --- a/stream/ai_alsa1x.c +++ b/stream/ai_alsa1x.c @@ -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. + */ + #include #include #include diff --git a/stream/ai_oss.c b/stream/ai_oss.c index d2d2f20163..14e8a921c8 100644 --- a/stream/ai_oss.c +++ b/stream/ai_oss.c @@ -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. + */ + #include #include diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c index 956f60daee..782c5b3dce 100644 --- a/stream/asf_streaming.c +++ b/stream/asf_streaming.c @@ -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. + */ + #include #include #include diff --git a/stream/audio_in.c b/stream/audio_in.c index 93513e9604..48e325706a 100644 --- a/stream/audio_in.c +++ b/stream/audio_in.c @@ -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. + */ + #include #include #include diff --git a/stream/audio_in.h b/stream/audio_in.h index d59b3b6c89..31688e7192 100644 --- a/stream/audio_in.h +++ b/stream/audio_in.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_AUDIO_IN_H #define MPLAYER_AUDIO_IN_H diff --git a/stream/cache2.c b/stream/cache2.c index fcef566762..1197df9df1 100644 --- a/stream/cache2.c +++ b/stream/cache2.c @@ -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. + */ + #include "config.h" // Initial draft of my new cache system... diff --git a/stream/cache2.h b/stream/cache2.h index 8403c05aff..330558333e 100644 --- a/stream/cache2.h +++ b/stream/cache2.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_CACHE2_H #define MPLAYER_CACHE2_H diff --git a/stream/cdd.h b/stream/cdd.h index 9d2ee4d9d0..9f2ae2fbb6 100644 --- a/stream/cdd.h +++ b/stream/cdd.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_CDD_H #define MPLAYER_CDD_H diff --git a/stream/cdinfo.c b/stream/cdinfo.c index 6e4544d366..d70f55070d 100644 --- a/stream/cdinfo.c +++ b/stream/cdinfo.c @@ -1,8 +1,24 @@ /* * CD Info - * by Bertrand Baudet - * (C) 2002, MPlayer team. -*/ + * + * Copyright (C) 2002 Bertrand Baudet + * + * 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. + */ #include "config.h" diff --git a/stream/cookies.c b/stream/cookies.c index 40a5b16097..6c8d5013aa 100644 --- a/stream/cookies.c +++ b/stream/cookies.c @@ -2,7 +2,23 @@ * HTTP Cookies * Reads Netscape and Mozilla cookies.txt files * - * by Dave Lambley + * Copyright (c) 2003 Dave Lambley + * + * 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. */ #include diff --git a/stream/cookies.h b/stream/cookies.h index bbfb9f0598..88ff96d66a 100644 --- a/stream/cookies.h +++ b/stream/cookies.h @@ -2,7 +2,23 @@ * HTTP Cookies * Reads Netscape and Mozilla cookies.txt files * - * by Dave Lambley + * Copyright (c) 2003 Dave Lambley + * + * 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_COOKIES_H diff --git a/stream/frequencies.c b/stream/frequencies.c index 5d8fe9b66a..0ac9e483ee 100644 --- a/stream/frequencies.c +++ b/stream/frequencies.c @@ -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. + */ + #include #include diff --git a/stream/frequencies.h b/stream/frequencies.h index 25795a4899..d0711e0cf7 100644 --- a/stream/frequencies.h +++ b/stream/frequencies.h @@ -4,6 +4,22 @@ * Nathan Laredo (laredo@broked.net) * * Frequencies are given in kHz + * + * 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_FREQUENCIES_H diff --git a/stream/http.c b/stream/http.c index f993fee179..f4ce03e038 100644 --- a/stream/http.c +++ b/stream/http.c @@ -1,7 +1,23 @@ /* * HTTP Helper - * by Bertrand Baudet - * (C) 2001, MPlayer team. + * + * Copyright (C) 2001 Bertrand Baudet + * + * 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. */ #include "config.h" diff --git a/stream/http.h b/stream/http.h index 849ebf06a3..c52b9c8c79 100644 --- a/stream/http.h +++ b/stream/http.h @@ -1,7 +1,23 @@ /* * HTTP Helper - * by Bertrand Baudet - * (C) 2001, MPlayer team. + * + * Copyright (C) 2001 Bertrand Baudet + * + * 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_HTTP_H diff --git a/stream/network.c b/stream/network.c index 801bebaf24..e90b4a4b90 100644 --- a/stream/network.c +++ b/stream/network.c @@ -1,7 +1,23 @@ /* * Network layer for MPlayer - * by Bertrand BAUDET - * (C) 2001, MPlayer team. + * + * Copyright (C) 2001 Bertrand Baudet + * + * 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. */ //#define DUMP2FILE diff --git a/stream/network.h b/stream/network.h index bc4ec598ef..c75d7f6fdb 100644 --- a/stream/network.h +++ b/stream/network.h @@ -1,7 +1,23 @@ /* * Network layer for MPlayer - * by Bertrand BAUDET - * (C) 2001, MPlayer team. + * + * Copyright (C) 2001 Bertrand Baudet + * + * 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_NETWORK_H diff --git a/stream/open.c b/stream/open.c index 5ef0a9e3ff..b14d37d562 100644 --- a/stream/open.c +++ b/stream/open.c @@ -1,3 +1,20 @@ +/* + * 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. + */ #include #include diff --git a/stream/realrtsp/xbuffer.c b/stream/realrtsp/xbuffer.c index 6b408d68bb..5db88b4b41 100644 --- a/stream/realrtsp/xbuffer.c +++ b/stream/realrtsp/xbuffer.c @@ -11,6 +11,21 @@ * You must take care of pointers returned by xbuffers functions (no macro to * do it automatically) * + * 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. */ #include diff --git a/stream/realrtsp/xbuffer.h b/stream/realrtsp/xbuffer.h index 695aa2e23f..9840542d3c 100644 --- a/stream/realrtsp/xbuffer.h +++ b/stream/realrtsp/xbuffer.h @@ -11,6 +11,21 @@ * You must take care of pointers returned by xbuffers functions (no macro to * do it automatically) * + * 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_XBUFFER_H diff --git a/stream/stream.c b/stream/stream.c index 819b04d9f6..87b2e02a29 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -1,3 +1,20 @@ +/* + * 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. + */ #include #include diff --git a/stream/stream.h b/stream/stream.h index 1270553a00..a995b8119f 100644 --- a/stream/stream.h +++ b/stream/stream.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_STREAM_H #define MPLAYER_STREAM_H diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 12063e53d8..2cb440a2ac 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -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. + */ + #include "config.h" #include diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c index 3a51cbc2ec..ad1b335de3 100644 --- a/stream/stream_cddb.c +++ b/stream/stream_cddb.c @@ -1,15 +1,29 @@ /* * CDDB HTTP protocol - * by Bertrand Baudet - * (C) 2002, MPlayer team. + * + * Copyright (C) 2002 Bertrand Baudet * * Implementation follow the freedb.howto1.06.txt specification * from http://freedb.freedb.org * * discid computation by Jeremy D. Zawodny * Copyright (c) 1998-2000 Jeremy D. Zawodny - * Code release under GPL * + * 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. */ #include "config.h" diff --git a/stream/stream_cue.c b/stream/stream_cue.c index 53cb01299b..6bddab7c9e 100644 --- a/stream/stream_cue.c +++ b/stream/stream_cue.c @@ -1,4 +1,22 @@ -//=================== VideoCD BinCue ========================== +/* + * VideoCD BinCue + * + * 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. + */ #include #include diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index a9b377a340..3747bbaac1 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -1,4 +1,20 @@ - +/* + * 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. + */ #include #include diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h index effd5b3d67..567d122ba7 100644 --- a/stream/stream_dvd.h +++ b/stream/stream_dvd.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_STREAM_DVD_H #define MPLAYER_STREAM_DVD_H diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c index 9e4da0955d..56c7ec20a0 100644 --- a/stream/stream_dvd_common.c +++ b/stream/stream_dvd_common.c @@ -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. + */ + #include "config.h" #include #include diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h index b5e86c1162..8044c6251b 100644 --- a/stream/stream_dvd_common.h +++ b/stream/stream_dvd_common.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_STREAM_DVD_COMMON_H #define MPLAYER_STREAM_DVD_COMMON_H diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 1d74504fa5..c2915fbd35 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -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. + */ + #include "config.h" #include diff --git a/stream/stream_dvdnav.h b/stream/stream_dvdnav.h index 0f0a93211e..656d1b8e62 100644 --- a/stream/stream_dvdnav.h +++ b/stream/stream_dvdnav.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_STREAM_DVDNAV_H #define MPLAYER_STREAM_DVDNAV_H diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c index 6aee8c63ee..d64300022e 100644 --- a/stream/stream_ffmpeg.c +++ b/stream/stream_ffmpeg.c @@ -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. + */ + #include "config.h" #include "libavformat/avformat.h" diff --git a/stream/stream_file.c b/stream/stream_file.c index 9a4d7a3500..149660857b 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -1,3 +1,20 @@ +/* + * 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. + */ #include "config.h" diff --git a/stream/stream_ftp.c b/stream/stream_ftp.c index e21e512989..0c5f775db6 100644 --- a/stream/stream_ftp.c +++ b/stream/stream_ftp.c @@ -1,3 +1,20 @@ +/* + * 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. + */ #include "config.h" diff --git a/stream/stream_live555.c b/stream/stream_live555.c index 8165899e94..37bc3be495 100644 --- a/stream/stream_live555.c +++ b/stream/stream_live555.c @@ -1,3 +1,20 @@ +/* + * 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. + */ #include "config.h" diff --git a/stream/stream_netstream.h b/stream/stream_netstream.h index 43d42a0a32..a81bc37c83 100644 --- a/stream/stream_netstream.h +++ b/stream/stream_netstream.h @@ -1,10 +1,25 @@ - /* * Common stuff for netstream * Packets and so on are defined here along with a few helpers * wich are used by both the client and the server * * Data is always low endian + * + * 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_NETSTREAM_H diff --git a/stream/stream_null.c b/stream/stream_null.c index 7bbef09c60..5465702be8 100644 --- a/stream/stream_null.c +++ b/stream/stream_null.c @@ -1,3 +1,20 @@ +/* + * 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. + */ #include "config.h" diff --git a/stream/stream_radio.h b/stream/stream_radio.h index c2de25a5aa..1af2f1f4b0 100644 --- a/stream/stream_radio.h +++ b/stream/stream_radio.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_STREAM_RADIO_H #define MPLAYER_STREAM_RADIO_H diff --git a/stream/stream_smb.c b/stream/stream_smb.c index 86bb3f84b0..4c57176d2f 100644 --- a/stream/stream_smb.c +++ b/stream/stream_smb.c @@ -1,3 +1,20 @@ +/* + * 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. + */ #include "config.h" diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index 53e82f7da2..4c85335073 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -1,3 +1,20 @@ +/* + * 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. + */ #include "config.h" diff --git a/stream/tcp.c b/stream/tcp.c index ff4db78847..cf067c2ee7 100644 --- a/stream/tcp.c +++ b/stream/tcp.c @@ -1,7 +1,23 @@ /* * Network layer for MPlayer - * by Bertrand BAUDET - * (C) 2001, MPlayer team. + * + * Copyright (C) 2001 Bertrand BAUDET + * + * 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. */ #include diff --git a/stream/tv.c b/stream/tv.c index 63497472c9..6c05ac2eb5 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -1,14 +1,29 @@ /* - TV Interface for MPlayer - - (C) Alex Beregszaszi - - API idea based on libvo2 - - Feb 19, 2002: Significant rewrites by Charles R. Henrich (henrich@msu.edu) - to add support for audio, and bktr *BSD support. - -*/ + * TV Interface for MPlayer + * + * API idea based on libvo2 + * + * Copyright (C) 2001 Alex Beregszaszi + * + * Feb 19, 2002: Significant rewrites by Charles R. Henrich (henrich@msu.edu) + * to add support for audio, and bktr *BSD support. + * + * 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. + */ #include #include diff --git a/stream/tvi_bsdbt848.c b/stream/tvi_bsdbt848.c index 431e8f9100..3d039911ab 100644 --- a/stream/tvi_bsdbt848.c +++ b/stream/tvi_bsdbt848.c @@ -1,14 +1,31 @@ /* - (C)2002 Charles R. Henrich (henrich@msu.edu) - *BSD (hopefully, requires working driver!) BrookTree capture support. - - Still in (active) development! - - v1.1 Mar 13 2002 Fully functional, need to move ring buffer to - the kernel driver. - v1.0 Feb 19 2002 First Release, need to add support for changing - audio parameters. -*/ + * *BSD (hopefully, requires working driver!) BrookTree capture support. + * + * Still in (active) development! + * + * v1.1 Mar 13 2002 Fully functional, need to move ring buffer to + * the kernel driver. + * v1.0 Feb 19 2002 First Release, need to add support for changing + * audio parameters. + * + * Copyright (C) 2002 Charles R. Henrich (henrich@msu.edu) + * + * 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. + */ #include "config.h" diff --git a/stream/tvi_def.h b/stream/tvi_def.h index f15fcce481..261a8ee4cd 100644 --- a/stream/tvi_def.h +++ b/stream/tvi_def.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_TVI_DEF_H #define MPLAYER_TVI_DEF_H diff --git a/stream/tvi_dshow.h b/stream/tvi_dshow.h index 3dea9d348a..7ec1ce8e50 100644 --- a/stream/tvi_dshow.h +++ b/stream/tvi_dshow.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_TVI_DSHOW_H #define MPLAYER_TVI_DSHOW_H diff --git a/stream/tvi_dummy.c b/stream/tvi_dummy.c index a9877fd653..8924c79220 100644 --- a/stream/tvi_dummy.c +++ b/stream/tvi_dummy.c @@ -1,6 +1,22 @@ /* - Only a sample! -*/ + * Only a sample! + * + * 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. + */ #include "config.h" diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c index e46f13797c..52a1ea76d8 100644 --- a/stream/tvi_v4l.c +++ b/stream/tvi_v4l.c @@ -1,19 +1,35 @@ /* - Video 4 Linux input - - (C) Alex Beregszaszi - - Some ideas are based on xawtv/libng's grab-v4l.c written by - Gerd Knorr - - Multithreading, a/v sync and native ALSA support by - Jindrich Makovicka - - Mjpeg hardware encoding support by - Ivan Szanto - - CODE IS UNDER DEVELOPMENT, NO FEATURE REQUESTS PLEASE! -*/ + * Video 4 Linux input + * + * Copyright (C) 2001 Alex Beregszaszi + * + * Some ideas are based on xawtv/libng's grab-v4l.c written by + * Gerd Knorr + * + * Multithreading, a/v sync and native ALSA support by + * Jindrich Makovicka + * + * MJPEG hardware encoding support by + * Ivan Szanto + * + * CODE IS UNDER DEVELOPMENT, NO FEATURE REQUESTS PLEASE! + * + * 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. + */ #include "config.h" diff --git a/stream/url.c b/stream/url.c index 92e872e599..62e3bdcf2a 100644 --- a/stream/url.c +++ b/stream/url.c @@ -1,8 +1,23 @@ /* * URL Helper - * by Bertrand Baudet - * (C) 2001, MPlayer team. * + * Copyright (C) 2001 Bertrand Baudet + * + * 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. */ #include diff --git a/stream/url.h b/stream/url.h index be39fddde2..fab81ecace 100644 --- a/stream/url.h +++ b/stream/url.h @@ -1,7 +1,23 @@ /* * URL Helper - * by Bertrand Baudet - * (C) 2001, MPlayer team. + * + * Copyright (C) 2001 Bertrand Baudet + * + * 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_URL_H diff --git a/stream/vcd_read.h b/stream/vcd_read.h index b31abc0401..2f60d518ad 100644 --- a/stream/vcd_read.h +++ b/stream/vcd_read.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_VCD_READ_H #define MPLAYER_VCD_READ_H diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h index e87f46db5a..4d4a0334ba 100644 --- a/stream/vcd_read_darwin.h +++ b/stream/vcd_read_darwin.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_VCD_READ_DARWIN_H #define MPLAYER_VCD_READ_DARWIN_H diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h index 01e51f7da5..e60590e1f5 100644 --- a/stream/vcd_read_fbsd.h +++ b/stream/vcd_read_fbsd.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_VCD_READ_FBSD_H #define MPLAYER_VCD_READ_FBSD_H diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h index 0df0320bb3..f0b7bd45ef 100644 --- a/stream/vcd_read_win32.h +++ b/stream/vcd_read_win32.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_VCD_READ_WIN32_H #define MPLAYER_VCD_READ_WIN32_H From 5640ddf49cbbf1c6ca2ed9249487ce3843a1cf85 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 30 Jan 2010 23:01:32 +0000 Subject: [PATCH 05/11] Add missing #include, fixes the warning: libvo/vo_png.c:147: warning: implicit declaration of function 'imgfmt2pixfmt' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30469 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_png.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libvo/vo_png.c b/libvo/vo_png.c index e7161ddd47..0f449cd9e3 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -31,6 +31,7 @@ #include #include "config.h" +#include "fmt-conversion.h" #include "mp_msg.h" #include "mp_msg.h" #include "help_mp.h" From 4a05e71cc7e64f44aed3306dec113c80f1f31265 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 30 Jan 2010 23:20:10 +0000 Subject: [PATCH 06/11] Add missing multiple inclusion guards. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30470 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-mplayer-def.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cfg-mplayer-def.h b/cfg-mplayer-def.h index 4ff64c953a..394fe10708 100644 --- a/cfg-mplayer-def.h +++ b/cfg-mplayer-def.h @@ -1,6 +1,10 @@ +#ifndef MPLAYER_CFG_MPLAYER_DEF_H +#define MPLAYER_CFG_MPLAYER_DEF_H + static char* default_config= "# Write your default config options here!\n" "\n" //"nosound=nem" "\n"; +#endif /* MPLAYER_CFG_MPLAYER_DEF_H */ From 99c1bbca2a389d1a778cdd7ff97e41548cab0534 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 30 Jan 2010 23:24:23 +0000 Subject: [PATCH 07/11] Add license header to all top-level files missing them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2 --- access_mpcontext.h | 18 ++++++++++++++++++ asxparser.c | 18 ++++++++++++++++++ asxparser.h | 18 ++++++++++++++++++ cfg-common-opts.h | 18 ++++++++++++++++++ cfg-common.h | 18 ++++++++++++++++++ cfg-mencoder.h | 18 ++++++++++++++++++ cfg-mplayer.h | 18 ++++++++++++++++++ codec-cfg.c | 20 ++++++++++++++++++-- codec-cfg.h | 18 ++++++++++++++++++ command.c | 18 ++++++++++++++++++ command.h | 18 ++++++++++++++++++ cpudetect.c | 18 ++++++++++++++++++ cpudetect.h | 18 ++++++++++++++++++ cpuinfo.c | 24 +++++++++++++++++++++--- edl.c | 18 ++++++++++++++++++ edl.h | 20 +++++++++++++++++++- find_sub.c | 22 +++++++++++++++++++--- fmt-conversion.h | 18 ++++++++++++++++++ get_path.c | 16 ++++++++++++++++ m_config.c | 17 +++++++++++++++++ m_config.h | 18 ++++++++++++++++++ m_option.c | 17 +++++++++++++++++ m_option.h | 18 ++++++++++++++++++ m_property.c | 17 +++++++++++++++++ m_property.h | 18 ++++++++++++++++++ m_struct.c | 17 +++++++++++++++++ m_struct.h | 18 ++++++++++++++++++ mencoder.c | 18 ++++++++++++++++++ mixer.c | 18 ++++++++++++++++++ mixer.h | 18 ++++++++++++++++++ mp_core.h | 18 ++++++++++++++++++ mp_fifo.c | 18 ++++++++++++++++++ mp_fifo.h | 18 ++++++++++++++++++ mp_msg.c | 18 ++++++++++++++++++ mp_msg.h | 18 ++++++++++++++++++ mp_osd.h | 18 ++++++++++++++++++ mpbswap.h | 18 ++++++++++++++++++ mpcommon.c | 18 ++++++++++++++++++ mpcommon.h | 18 ++++++++++++++++++ mplayer.c | 17 +++++++++++++++++ mplayer.h | 17 +++++++++++++++++ parser-cfg.c | 17 +++++++++++++++++ parser-cfg.h | 18 ++++++++++++++++++ parser-mecmd.c | 17 +++++++++++++++++ parser-mecmd.h | 18 ++++++++++++++++++ parser-mpcmd.c | 17 +++++++++++++++++ parser-mpcmd.h | 18 ++++++++++++++++++ playtree.c | 17 +++++++++++++++++ playtree.h | 18 ++++++++++++++++++ playtreeparser.c | 17 +++++++++++++++++ playtreeparser.h | 18 ++++++++++++++++++ spudec.c | 40 ++++++++++++++++++++++++++++------------ spudec.h | 18 ++++++++++++++++++ sub_cc.c | 21 ++++++++++++++++++--- sub_cc.h | 18 ++++++++++++++++++ subopt-helper.c | 18 ++++++++++++++++++ subopt-helper.h | 18 ++++++++++++++++++ subreader.c | 18 ++++++++++++++++-- subreader.h | 18 ++++++++++++++++++ vobsub.c | 17 +++++++++++++++++ vobsub.h | 18 ++++++++++++++++++ 61 files changed, 1097 insertions(+), 26 deletions(-) diff --git a/access_mpcontext.h b/access_mpcontext.h index c975a90fe6..23bfcfb0ce 100644 --- a/access_mpcontext.h +++ b/access_mpcontext.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_ACCESS_MPCONTEXT_H #define MPLAYER_ACCESS_MPCONTEXT_H diff --git a/asxparser.c b/asxparser.c index 9d4d36c3c6..1505e8a625 100644 --- a/asxparser.c +++ b/asxparser.c @@ -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. + */ + #include "config.h" #include diff --git a/asxparser.h b/asxparser.h index 9763b69902..b300dde0e3 100644 --- a/asxparser.h +++ b/asxparser.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_ASXPARSER_H #define MPLAYER_ASXPARSER_H diff --git a/cfg-common-opts.h b/cfg-common-opts.h index d9bfd8caa9..dd9b691002 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.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_CFG_COMMON_OPTS_H #define MPLAYER_CFG_COMMON_OPTS_H diff --git a/cfg-common.h b/cfg-common.h index a7f6570e2e..db167d2f27 100644 --- a/cfg-common.h +++ b/cfg-common.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_CFG_COMMON_H #define MPLAYER_CFG_COMMON_H diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 31f3a3ca30..d58f87b4d3 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.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_CFG_MENCODER_H #define MPLAYER_CFG_MENCODER_H diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 630d5e9d4a..4eb42a3adf 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.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_CFG_MPLAYER_H #define MPLAYER_CFG_MPLAYER_H diff --git a/codec-cfg.c b/codec-cfg.c index 840fb94ec1..5d796275ce 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -1,7 +1,5 @@ /* * codec.conf parser - * by Szabolcs Berecz - * (C) 2001 * * to compile test application: * cc -I. -DTESTING -o codec-cfg-test codec-cfg.c mp_msg.o osdep/getch2.o -ltermcap @@ -9,6 +7,24 @@ * gcc -DCODECS2HTML -o codecs2html codec-cfg.c mp_msg.o * * TODO: implement informat in CODECS2HTML too + * + * Copyright (C) 2001 Szabolcs Berecz + * + * 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. */ #define DEBUG diff --git a/codec-cfg.h b/codec-cfg.h index b9842d0a99..d3a1ae03ab 100644 --- a/codec-cfg.h +++ b/codec-cfg.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_CODEC_CFG_H #define MPLAYER_CODEC_CFG_H diff --git a/command.c b/command.c index c355599502..cd9d2abf5d 100644 --- a/command.c +++ b/command.c @@ -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. + */ + #include #include #include diff --git a/command.h b/command.h index f87c5a00ca..4bd01a0296 100644 --- a/command.h +++ b/command.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_COMMAND_H #define MPLAYER_COMMAND_H diff --git a/cpudetect.c b/cpudetect.c index 592eb65090..efaa88de37 100644 --- a/cpudetect.c +++ b/cpudetect.c @@ -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. + */ + #include "config.h" #include "cpudetect.h" #include "mp_msg.h" diff --git a/cpudetect.h b/cpudetect.h index 5ac4633582..7c0f7e7cd0 100644 --- a/cpudetect.h +++ b/cpudetect.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_CPUDETECT_H #define MPLAYER_CPUDETECT_H diff --git a/cpuinfo.c b/cpuinfo.c index 660ccd3fb4..1610cb3092 100644 --- a/cpuinfo.c +++ b/cpuinfo.c @@ -1,6 +1,24 @@ -/* small utility to extract CPU information - Used by configure to set CPU optimization levels on some operating - systems where /proc/cpuinfo is non-existent or unreliable. */ +/* + * small utility to extract CPU information + * Used by configure to set CPU optimization levels on some operating + * systems where /proc/cpuinfo is non-existent or unreliable. + * + * 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. + */ #include #include diff --git a/edl.c b/edl.c index 5a38d9d59b..6711c1f2e5 100644 --- a/edl.c +++ b/edl.c @@ -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. + */ + #include #include #include "config.h" diff --git a/edl.h b/edl.h index 8c21a34173..f7f8b81122 100644 --- a/edl.h +++ b/edl.h @@ -1,4 +1,22 @@ -// EDL version 0.6 +/* + * EDL version 0.6 + * + * 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_EDL_H #define MPLAYER_EDL_H diff --git a/find_sub.c b/find_sub.c index c5081a519d..dcd045eb60 100644 --- a/find_sub.c +++ b/find_sub.c @@ -1,6 +1,22 @@ -//**************************************************************************// -// .SUB -//**************************************************************************// +/* + * .SUB + * + * 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. + */ #include "config.h" diff --git a/fmt-conversion.h b/fmt-conversion.h index a4ee820353..9e133a8222 100644 --- a/fmt-conversion.h +++ b/fmt-conversion.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_FMT_CONVERSION_H #define MPLAYER_FMT_CONVERSION_H diff --git a/get_path.c b/get_path.c index 6ef074b869..ec76f57191 100644 --- a/get_path.c +++ b/get_path.c @@ -5,6 +5,22 @@ * Returns the pointer to the ALLOCATED buffer containing the * zero terminated path string. This buffer has to be FREED * by the caller. + * + * 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. */ #include diff --git a/m_config.c b/m_config.c index 7d85f547e3..f2902f9873 100644 --- a/m_config.c +++ b/m_config.c @@ -1,3 +1,20 @@ +/* + * 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. + */ /// \file /// \ingroup Config diff --git a/m_config.h b/m_config.h index 8a666ecec1..2805c40fd0 100644 --- a/m_config.h +++ b/m_config.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_M_CONFIG_H #define MPLAYER_M_CONFIG_H diff --git a/m_option.c b/m_option.c index a4c5950b5a..35e2b775c9 100644 --- a/m_option.c +++ b/m_option.c @@ -1,3 +1,20 @@ +/* + * 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. + */ /// \file /// \ingroup Options diff --git a/m_option.h b/m_option.h index 9417fb562e..3aa7ba930a 100644 --- a/m_option.h +++ b/m_option.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_M_OPTION_H #define MPLAYER_M_OPTION_H diff --git a/m_property.c b/m_property.c index c81fced8a5..8ab97d82e8 100644 --- a/m_property.c +++ b/m_property.c @@ -1,3 +1,20 @@ +/* + * 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. + */ /// \file /// \ingroup Properties diff --git a/m_property.h b/m_property.h index 1bab02d6f1..0a94b26335 100644 --- a/m_property.h +++ b/m_property.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_M_PROPERTY_H #define MPLAYER_M_PROPERTY_H diff --git a/m_struct.c b/m_struct.c index 267d956df7..8accb4080f 100644 --- a/m_struct.c +++ b/m_struct.c @@ -1,3 +1,20 @@ +/* + * 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. + */ /// \file /// \ingroup OptionsStruct diff --git a/m_struct.h b/m_struct.h index 57bf46f603..220fa3a672 100644 --- a/m_struct.h +++ b/m_struct.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_M_STRUCT_H #define MPLAYER_M_STRUCT_H diff --git a/mencoder.c b/mencoder.c index 7e7f4334fa..1265c0b227 100644 --- a/mencoder.c +++ b/mencoder.c @@ -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. + */ + #define VCODEC_COPY 0 #define VCODEC_FRAMENO 1 // real codecs: diff --git a/mixer.c b/mixer.c index 3e66b78cfc..eb1210c780 100644 --- a/mixer.c +++ b/mixer.c @@ -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. + */ + #include #ifndef __MINGW32__ #include diff --git a/mixer.h b/mixer.h index aa36d0c60f..5a2d0e5027 100644 --- a/mixer.h +++ b/mixer.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_MIXER_H #define MPLAYER_MIXER_H diff --git a/mp_core.h b/mp_core.h index 5d3f86972c..83eca9ebe1 100644 --- a/mp_core.h +++ b/mp_core.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_MP_CORE_H #define MPLAYER_MP_CORE_H diff --git a/mp_fifo.c b/mp_fifo.c index 5d0159dfd8..f56f79555b 100644 --- a/mp_fifo.c +++ b/mp_fifo.c @@ -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. + */ + #include #include "osdep/timer.h" #include "input/input.h" diff --git a/mp_fifo.h b/mp_fifo.h index 5a5c925462..b50173c0af 100644 --- a/mp_fifo.h +++ b/mp_fifo.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_MP_FIFO_H #define MPLAYER_MP_FIFO_H diff --git a/mp_msg.c b/mp_msg.c index b20d99ee6f..93f793d7c8 100644 --- a/mp_msg.c +++ b/mp_msg.c @@ -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. + */ + #include #include #include diff --git a/mp_msg.h b/mp_msg.h index 3fdd851b16..44ce09e2fc 100644 --- a/mp_msg.h +++ b/mp_msg.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_MP_MSG_H #define MPLAYER_MP_MSG_H diff --git a/mp_osd.h b/mp_osd.h index adaba8adab..b9f10d664b 100644 --- a/mp_osd.h +++ b/mp_osd.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_MP_OSD_H #define MPLAYER_MP_OSD_H diff --git a/mpbswap.h b/mpbswap.h index 03ef0c387b..66640e63c2 100644 --- a/mpbswap.h +++ b/mpbswap.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_MPBSWAP_H #define MPLAYER_MPBSWAP_H diff --git a/mpcommon.c b/mpcommon.c index 2cdebe5305..bdc307baeb 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -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. + */ + #include #include "stream/stream.h" #include "libmpdemux/demuxer.h" diff --git a/mpcommon.h b/mpcommon.h index 6137c72e4f..412225b104 100644 --- a/mpcommon.h +++ b/mpcommon.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_MPCOMMON_H #define MPLAYER_MPCOMMON_H diff --git a/mplayer.c b/mplayer.c index 1344fecda5..e508e03be1 100644 --- a/mplayer.c +++ b/mplayer.c @@ -1,3 +1,20 @@ +/* + * 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. + */ /// \file /// \ingroup Properties Command2Property OSDMsgStack diff --git a/mplayer.h b/mplayer.h index bae7f3ea16..2f67959be5 100644 --- a/mplayer.h +++ b/mplayer.h @@ -1,3 +1,20 @@ +/* + * 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_MPLAYER_H #define MPLAYER_MPLAYER_H diff --git a/parser-cfg.c b/parser-cfg.c index 8dc0744b0d..562200c56a 100644 --- a/parser-cfg.c +++ b/parser-cfg.c @@ -1,3 +1,20 @@ +/* + * 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. + */ /// \defgroup ConfigParsers Config parsers /// diff --git a/parser-cfg.h b/parser-cfg.h index ed5e64c6a4..1b90c71e15 100644 --- a/parser-cfg.h +++ b/parser-cfg.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_PARSER_CFG_H #define MPLAYER_PARSER_CFG_H diff --git a/parser-mecmd.c b/parser-mecmd.c index 172ead5937..8abe37a359 100644 --- a/parser-mecmd.c +++ b/parser-mecmd.c @@ -1,3 +1,20 @@ +/* + * 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. + */ /// \file /// \ingroup ConfigParsers MEntry diff --git a/parser-mecmd.h b/parser-mecmd.h index a7f5b33bff..86d885ba98 100644 --- a/parser-mecmd.h +++ b/parser-mecmd.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_PARSER_MECMD_H #define MPLAYER_PARSER_MECMD_H diff --git a/parser-mpcmd.c b/parser-mpcmd.c index c16148bc8b..b493ddf089 100644 --- a/parser-mpcmd.c +++ b/parser-mpcmd.c @@ -1,3 +1,20 @@ +/* + * 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. + */ /// \file /// \ingroup ConfigParsers Playtree diff --git a/parser-mpcmd.h b/parser-mpcmd.h index bcee4db882..c88ec59e77 100644 --- a/parser-mpcmd.h +++ b/parser-mpcmd.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_PARSER_MPCMD_H #define MPLAYER_PARSER_MPCMD_H diff --git a/playtree.c b/playtree.c index 4a017be425..f06d1eebea 100644 --- a/playtree.c +++ b/playtree.c @@ -1,3 +1,20 @@ +/* + * 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. + */ /// \file /// \ingroup Playtree diff --git a/playtree.h b/playtree.h index 9b5b82e2ba..73bedde082 100644 --- a/playtree.h +++ b/playtree.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_PLAYTREE_H #define MPLAYER_PLAYTREE_H diff --git a/playtreeparser.c b/playtreeparser.c index 4ce9bd84cb..2e3b7fd44a 100644 --- a/playtreeparser.c +++ b/playtreeparser.c @@ -1,3 +1,20 @@ +/* + * 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. + */ /// \file /// \ingroup PlaytreeParser diff --git a/playtreeparser.h b/playtreeparser.h index f0e11a6970..53744ac0a2 100644 --- a/playtreeparser.h +++ b/playtreeparser.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_PLAYTREEPARSER_H #define MPLAYER_PLAYTREEPARSER_H diff --git a/spudec.c b/spudec.c index 3824f12462..6241c99e0c 100644 --- a/spudec.c +++ b/spudec.c @@ -1,16 +1,32 @@ -/* SPUdec.c - Skeleton of function spudec_process_controll() is from xine sources. - Further works: - LGB,... (yeah, try to improve it and insert your name here! ;-) - - Kim Minh Kaplan - implement fragments reassembly, RLE decoding. - read brightness from the IFO. - - For information on SPU format see - and - +/* + * Skeleton of function spudec_process_controll() is from xine sources. + * Further works: + * LGB,... (yeah, try to improve it and insert your name here! ;-) + * + * Kim Minh Kaplan + * implement fragments reassembly, RLE decoding. + * read brightness from the IFO. + * + * For information on SPU format see + * and + * + * 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. */ + #include "config.h" #include "mp_msg.h" diff --git a/spudec.h b/spudec.h index d4c794973b..89bc76de8a 100644 --- a/spudec.h +++ b/spudec.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_SPUDEC_H #define MPLAYER_SPUDEC_H diff --git a/sub_cc.c b/sub_cc.c index 7c3c688d9d..3bf4d5035c 100644 --- a/sub_cc.c +++ b/sub_cc.c @@ -7,12 +7,27 @@ * Most notably, only the text information is decoded as of now, discarding * color, background and position info (see source below). * - * by Matteo Giani - * * uses source from the xine closed captions decoder + * + * Copyright (C) 2002 Matteo Giani + * + * 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. */ - #include #include #include diff --git a/sub_cc.h b/sub_cc.h index 344fbbab77..7062849f91 100644 --- a/sub_cc.h +++ b/sub_cc.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_SUB_CC_H #define MPLAYER_SUB_CC_H diff --git a/subopt-helper.c b/subopt-helper.c index 6167778b9f..810fcd1a73 100644 --- a/subopt-helper.c +++ b/subopt-helper.c @@ -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. + */ + /** * \file subopt-helper.c * diff --git a/subopt-helper.h b/subopt-helper.h index ec8ff7f378..38bd39ec66 100644 --- a/subopt-helper.h +++ b/subopt-helper.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_SUBOPT_HELPER_H #define MPLAYER_SUBOPT_HELPER_H diff --git a/subreader.c b/subreader.c index 54de174009..c471e75e53 100644 --- a/subreader.c +++ b/subreader.c @@ -1,12 +1,26 @@ /* * Subtitle reader with format autodetection * - * Written by laaz + * Copyright (c) 2001 laaz * Some code cleanup & realloc() by A'rpi/ESP-team * + * 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. */ - #include #include #include diff --git a/subreader.h b/subreader.h index 18aeed05c9..3893124f5a 100644 --- a/subreader.h +++ b/subreader.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_SUBREADER_H #define MPLAYER_SUBREADER_H diff --git a/vobsub.c b/vobsub.c index df4b2d0a54..eeb8592607 100644 --- a/vobsub.c +++ b/vobsub.c @@ -1,7 +1,24 @@ /* * Some code freely inspired from VobSub , * with kind permission from Gabest + * + * 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. */ + #include #include #include diff --git a/vobsub.h b/vobsub.h index c14ce9c711..fb4b5eca4a 100644 --- a/vobsub.h +++ b/vobsub.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_VOBSUB_H #define MPLAYER_VOBSUB_H From 0d3fe701b0f4d0ad156cfcf28aab805c85d1f3a7 Mon Sep 17 00:00:00 2001 From: mru Date: Sun, 31 Jan 2010 00:20:37 +0000 Subject: [PATCH 08/11] Blackfin: use SRAM only when CONFIG_SRAM is set git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30472 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/bfin/internal_bfin.S | 2 +- libswscale/bfin/swscale_bfin.c | 2 +- libswscale/bfin/yuv2rgb_bfin.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libswscale/bfin/internal_bfin.S b/libswscale/bfin/internal_bfin.S index fb7bda7e12..98f69ef53f 100644 --- a/libswscale/bfin/internal_bfin.S +++ b/libswscale/bfin/internal_bfin.S @@ -94,7 +94,7 @@ to do with the memory system. */ #define mL3 .text -#ifdef __FDPIC__ +#if defined(__FDPIC__) && CONFIG_SRAM #define mL1 .l1.text #else #define mL1 mL3 diff --git a/libswscale/bfin/swscale_bfin.c b/libswscale/bfin/swscale_bfin.c index 2ad81d847d..ce2f1720dd 100644 --- a/libswscale/bfin/swscale_bfin.c +++ b/libswscale/bfin/swscale_bfin.c @@ -31,7 +31,7 @@ #include "libswscale/swscale.h" #include "libswscale/swscale_internal.h" -#ifdef __FDPIC__ +#if defined (__FDPIC__) && CONFIG_SRAM #define L1CODE __attribute__ ((l1_text)) #else #define L1CODE diff --git a/libswscale/bfin/yuv2rgb_bfin.c b/libswscale/bfin/yuv2rgb_bfin.c index 39e1ec87b5..eaa83eaf3b 100644 --- a/libswscale/bfin/yuv2rgb_bfin.c +++ b/libswscale/bfin/yuv2rgb_bfin.c @@ -32,7 +32,7 @@ #include "libswscale/swscale.h" #include "libswscale/swscale_internal.h" -#ifdef __FDPIC__ +#if defined(__FDPIC__) && CONFIG_SRAM #define L1CODE __attribute__ ((l1_text)) #else #define L1CODE From a81ed9c540d92ead8b276191ab136ab5d18885f4 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 31 Jan 2010 01:42:11 +0000 Subject: [PATCH 09/11] Document that -af-adv force=0 currently does the same as =1 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30473 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index aa5c72aca3..7cd8524962 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -4496,7 +4496,7 @@ Specify advanced audio filter options: .IPs force=<0\-7> Forces the insertion of audio filters to one of the following: .RSss -0: Use completely automatic filter insertion. +0: Use completely automatic filter insertion (currently identical to 1). .br 1: Optimize for accuracy (default). .br From 3949328e2c4c353dbfb799cf9c12da6565f5ec51 Mon Sep 17 00:00:00 2001 From: stefano Date: Sun, 31 Jan 2010 10:16:05 +0000 Subject: [PATCH 10/11] Declare support for the pixel formats: PIX_FMT_YUVJ420P PIX_FMT_YUVJ422P PIX_FMT_YUVJ440P PIX_FMT_YUVJ444P in the isSupported{In,Out} macros. These pixel formats are not true pixel formats but hacks specific to JPEG in libavcodec. They are deprecated and should be removed (that is from libavcodec first and libswscale second)... but they must be tested by swscale-test. See thread: Subject: [FFmpeg-devel] [PATCH] Extend show_pix_fmts() to make it print the input/output support Date: 2010-01-30 15:54:08 GMT git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30474 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/utils.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libswscale/utils.c b/libswscale/utils.c index 95edcb42a7..928a5fd85e 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -92,6 +92,10 @@ const char *swscale_license(void) || (x)==PIX_FMT_YUV444P \ || (x)==PIX_FMT_YUV422P \ || (x)==PIX_FMT_YUV411P \ + || (x)==PIX_FMT_YUVJ420P \ + || (x)==PIX_FMT_YUVJ422P \ + || (x)==PIX_FMT_YUVJ440P \ + || (x)==PIX_FMT_YUVJ444P \ || (x)==PIX_FMT_PAL8 \ || (x)==PIX_FMT_BGR8 \ || (x)==PIX_FMT_RGB8 \ @@ -121,6 +125,10 @@ int sws_isSupportedInput(enum PixelFormat pix_fmt) || (x)==PIX_FMT_YUV444P \ || (x)==PIX_FMT_YUV422P \ || (x)==PIX_FMT_YUV411P \ + || (x)==PIX_FMT_YUVJ420P \ + || (x)==PIX_FMT_YUVJ422P \ + || (x)==PIX_FMT_YUVJ440P \ + || (x)==PIX_FMT_YUVJ444P \ || isAnyRGB(x) \ || (x)==PIX_FMT_NV12 \ || (x)==PIX_FMT_NV21 \ From b1ca7b2a66a2f53312cd831de42b80aa430c6898 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 31 Jan 2010 10:29:29 +0000 Subject: [PATCH 11/11] Fix layout for the mouse/joystick controls sections. hint by KM, k.nxco.rp gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30475 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 7cd8524962..600db5d0f0 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -443,8 +443,6 @@ Switch teletext on/\:off. Go to next/\:prev teletext page. .RE .PD 1 -.PP -.RS . .TP .B mouse control