diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /libmpcodecs | |
parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad_qtaudio.c | 15 | ||||
-rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 8 | ||||
-rw-r--r-- | libmpcodecs/vd_qtvideo.c | 33 | ||||
-rw-r--r-- | libmpcodecs/ve_xvid4.c | 8 | ||||
-rw-r--r-- | libmpcodecs/vf_remove_logo.c | 46 |
5 files changed, 47 insertions, 63 deletions
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index cfc5dd26f8..2fa71c6548 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -4,20 +4,15 @@ #include <inttypes.h> #include "config.h" - -#ifdef CONFIG_QUICKTIME -#include <QuickTime/QuickTimeComponents.h> -#endif - #include "mp_msg.h" - -#include "loader/wine/windef.h" - -#include "ad_internal.h" #include "mpbswap.h" +#include "ad_internal.h" -#ifdef WIN32_LOADER +#ifdef CONFIG_QUICKTIME +#include <QuickTime/QuickTimeComponents.h> +#else #include "loader/ldt_keeper.h" +#include "loader/wine/windef.h" #endif static const ad_info_t info = { diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 17db42b5cc..0e8fd81f97 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -924,7 +924,7 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){ sh_video_t * sh = avctx->opaque; vd_ffmpeg_ctx *ctx = sh->context; mp_image_t* mpi=NULL; - xvmc_render_state_t * render; + struct xvmc_render_state * render; int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE| MP_IMGFLAG_DRAW_CALLBACK; @@ -1003,7 +1003,7 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){ pic->type= FF_BUFFER_TYPE_USER; - render=(xvmc_render_state_t*)mpi->priv;//same as data[2] + render=(struct xvmc_render_state*)mpi->priv;//same as data[2] if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) ) mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_get_buffer (render=%p)\n",render); assert(render != 0); @@ -1017,7 +1017,7 @@ static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic){ mp_image_t* mpi= pic->opaque; sh_video_t * sh = avctx->opaque; vd_ffmpeg_ctx *ctx = sh->context; - xvmc_render_state_t * render; + struct xvmc_render_state * render; int i; @@ -1030,7 +1030,7 @@ static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic){ //printf("R%X %X\n", pic->linesize[0], pic->data[0]); //mark the surface as not requared for prediction - render=(xvmc_render_state_t*)pic->data[2];//same as mpi->priv + render=(struct xvmc_render_state*)pic->data[2];//same as mpi->priv if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) ) mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_release_buffer (render=%p)\n",render); assert(render!=NULL); diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index 9b5ad87165..8b32cf9a6d 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -3,19 +3,17 @@ #include <inttypes.h> #include "config.h" +#include "mp_msg.h" +#include "mpbswap.h" +#include "vd_internal.h" #ifdef CONFIG_QUICKTIME #include <QuickTime/ImageCodec.h> #define dump_ImageDescription(x) -#endif - -#include "loader/wine/windef.h" - -#include "mp_msg.h" -#include "vd_internal.h" - -#ifdef WIN32_LOADER +#else #include "loader/ldt_keeper.h" +#include "loader/qtx/qtxsdk/components.h" +#include "loader/wine/windef.h" #endif static const vd_info_t info = { @@ -28,16 +26,6 @@ static const vd_info_t info = { LIBVD_EXTERN(qtvideo) -#include "mpbswap.h" - -#ifndef CONFIG_QUICKTIME -#include "loader/qtx/qtxsdk/components.h" - -HMODULE WINAPI LoadLibraryA(LPCSTR); -FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); -int WINAPI FreeLibrary(HMODULE); -#endif - //static ComponentDescription desc; // for FindNextComponent() static ComponentInstance ci=NULL; // codec handle //static CodecInfo cinfo; // for ImageCodecGetCodecInfo() @@ -50,10 +38,13 @@ static Rect OutBufferRect; //the dimensions of our GWorld static GWorldPtr OutBufferGWorld = NULL;//a GWorld is some kind of description for a drawing environment static ImageDescriptionHandle framedescHandle; -static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts -static HMODULE handler; #ifndef CONFIG_QUICKTIME +HMODULE WINAPI LoadLibraryA(LPCSTR); +FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); +int WINAPI FreeLibrary(HMODULE); +static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts +static HMODULE handler; static Component (*FindNextComponent)(Component prev,ComponentDescription* desc); static OSErr (*GetComponentInfo)(Component prev,ComponentDescription* desc,Handle h1,Handle h2,Handle h3); static long (*CountComponents)(ComponentDescription* desc); @@ -93,7 +84,9 @@ static int codec_initialized=0; // init driver static int init(sh_video_t *sh){ +#ifndef CONFIG_QUICKTIME long result = 1; +#endif ComponentResult cres; ComponentDescription desc; Component prev=NULL; diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c index 3e400eb9bd..2b55f7744f 100644 --- a/libmpcodecs/ve_xvid4.c +++ b/libmpcodecs/ve_xvid4.c @@ -78,7 +78,7 @@ typedef const struct { - char *name; ///< profile name + const char *name; ///< profile name int id; ///< mpeg-4 profile id; iso/iec 14496-2:2001 table G-1 int width; ///< profile width restriction int height; ///< profile height restriction @@ -100,7 +100,7 @@ typedef const struct /* default vbv_occupancy is (64/170)*vbv_buffer_size */ -static profile_t profiles[] = +static const profile_t profiles[] = { /* name p@l w h fps obj Tvmv vmv vcv ac% vbv pkt bps vbv_peak dbf flags */ /* unrestricted profile (default) */ @@ -139,7 +139,7 @@ static profile_t profiles[] = * \param str the profile name * \return pointer of the appropriate profiles array entry or NULL for a mistyped profile name */ -static profile_t *profileFromName(char *str) +static const profile_t *profileFromName(const char *str) { profile_t *cur = profiles; while (cur->name && strcasecmp(cur->name, str)) cur++; @@ -672,7 +672,7 @@ static int dispatch_settings(xvid_mplayer_module_t *mod) }; //profile is unrestricted as default - profile_t *selected_profile = profileFromName("unrestricted"); + const profile_t *selected_profile = profileFromName("unrestricted"); if(xvidenc_profile) selected_profile = profileFromName(xvidenc_profile); if(!selected_profile) diff --git a/libmpcodecs/vf_remove_logo.c b/libmpcodecs/vf_remove_logo.c index d378fec59c..919c17455d 100644 --- a/libmpcodecs/vf_remove_logo.c +++ b/libmpcodecs/vf_remove_logo.c @@ -1,29 +1,25 @@ /* -Copyright 2005 Robert Edele. - -e-mail: yartrebo@earthlink.net - -This program 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. - -This program 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 Public License for more -details. - -You should have reveived a copy of the GNU General Public License -along with this program; if not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA - -__________________________________________________________________________ -| Robert Edele Fri. 4-Feb-2005 | -| This program loads a .pgm mask file showing where a logo is and uses | -| a blur transform to remove the logo. | -|________________________________________________________________________| -*/ + * This filter loads a .pgm mask file showing where a logo is and uses + * a blur transform to remove the logo. + * + * Copyright (C) 2005 Robert Edele <yartrebo@earthlink.net> + * + * 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 vf_remove_logo.c |