From 6ad1f58ab878345412736d02a4be53bee427a153 Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 15 Dec 2008 13:53:07 +0000 Subject: Simplify the definition of MANGLE, possibly also makes it easier to support more systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28151 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mangle.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mangle.h b/mangle.h index 37d5c148f6..967b925dc8 100644 --- a/mangle.h +++ b/mangle.h @@ -29,12 +29,6 @@ #define attribute_used #endif -/* Feel free to add more to the list, eg. a.out IMO */ -#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__OS2__) || \ - (defined(__OpenBSD__) && !defined(__ELF__)) || defined(__APPLE__) -#define MANGLE(a) "_" #a -#else -#define MANGLE(a) #a -#endif +#define MANGLE(a) EXTERN_PREFIX #a #endif /* MPLAYER_MANGLE_H */ -- cgit v1.2.3 From 18100af70f3f56919e99a6cafb8764bb37a79353 Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 15 Dec 2008 16:13:41 +0000 Subject: Consistently include config.h before mangle.h, fixes possible compilation issues due to r28151 (using EXTERN_PREFIX). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28152 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/dct36_3dnow.c | 1 + mp3lib/dct64_mmx.c | 1 + 2 files changed, 2 insertions(+) diff --git a/mp3lib/dct36_3dnow.c b/mp3lib/dct36_3dnow.c index 02d23975b4..7f39caacea 100644 --- a/mp3lib/dct36_3dnow.c +++ b/mp3lib/dct36_3dnow.c @@ -29,6 +29,7 @@ #define real float /* ugly - but only way */ +#include "config.h" #include "mangle.h" #ifdef DCT36_OPTIMIZE_FOR_K7 diff --git a/mp3lib/dct64_mmx.c b/mp3lib/dct64_mmx.c index 4cce96bd7d..5dec11cb97 100644 --- a/mp3lib/dct64_mmx.c +++ b/mp3lib/dct64_mmx.c @@ -3,6 +3,7 @@ * See ChangeLog of mpg123-0.59s-pre.1 for detail * Applied to mplayer by Nick Kurshev */ +#include "config.h" #include "mangle.h" #define real float /* ugly - but only way */ -- cgit v1.2.3 From 6574e5da3457249749acd810006983605cf2cf7a Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 15 Dec 2008 20:19:27 +0000 Subject: 100l, reorder check for AC3 format to avoid a possible memleak git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28153 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_alsa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index cd7b862728..f7eeb7ddd9 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -119,6 +119,9 @@ static int control(int cmd, void *arg) long get_vol, set_vol; float f_multi; + if(ao_data.format == AF_FORMAT_AC3) + return CONTROL_TRUE; + if(mixer_channel) { char *test_mix_index; @@ -137,9 +140,6 @@ static int control(int cmd, void *arg) } if(mixer_device) card = mixer_device; - if(ao_data.format == AF_FORMAT_AC3) - return CONTROL_TRUE; - //allocate simple id snd_mixer_selem_id_alloca(&sid); -- cgit v1.2.3 From 93574faeeef013bf27081dccce4710407d92bfb0 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 15 Dec 2008 22:25:39 +0000 Subject: xvmc is now a CONFIG_ option in FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28154 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 6 +++--- libmpcodecs/vd_ffmpeg.c | 16 ++++++++-------- libvo/video_out.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure b/configure index df1e56a701..652694ffae 100755 --- a/configure +++ b/configure @@ -4114,12 +4114,12 @@ EOF done fi if test "$_xvmc" = yes ; then - _def_xvmc='#define HAVE_XVMC 1' + _def_xvmc='#define CONFIG_XVMC 1' _libs_mplayer="$_libs_mplayer -lXvMC -l$_xvmclib" _vomodules="xvmc $_vomodules" _res_comment="using $_xvmclib" else - _def_xvmc='#undef HAVE_XVMC' + _def_xvmc='#undef CONFIG_XVMC' _novomodules="xvmc $_novomodules" _libavdecoders=`echo $_libavdecoders | sed -e s/MPEG_XVMC_DECODER// ` fi @@ -7975,7 +7975,6 @@ GUI_GTK = $_gui_gtk GUI_WIN32 = $_gui_win32 HAVE_POSIX_SELECT = $_posix_select HAVE_SYS_MMAN_H = $_mman -HAVE_XVMC = $_xvmc IVTV = $_ivtv JACK = $_jack JOYSTICK = $_joystick @@ -8130,6 +8129,7 @@ CONFIG_MUXERS=$_mencoder CONFIG_POSTPROC = yes # Prevent building libavcodec/imgresample.c with conflicting symbols CONFIG_SWSCALE=yes +CONFIG_XVMC=$_xvmc CONFIG_ZLIB=$_zlib HAVE_PTHREADS = $_pthreads diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 1a25a84959..dc3aee1060 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -26,7 +26,7 @@ LIBVD_EXTERN(ffmpeg) #include "libavcodec/avcodec.h" -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC #include "xvmc_render.h" #endif @@ -59,7 +59,7 @@ typedef struct { static int get_buffer(AVCodecContext *avctx, AVFrame *pic); static void release_buffer(AVCodecContext *avctx, AVFrame *pic); -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC static enum PixelFormat get_format(struct AVCodecContext * avctx, const enum PixelFormat * pix_fmt); static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic); @@ -143,7 +143,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ if(avctx->pix_fmt==PIX_FMT_YUV420P) return CONTROL_TRUE;// u/v swap if(avctx->pix_fmt==PIX_FMT_YUV422P && !ctx->do_dr1) return CONTROL_TRUE;// half stride break; -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC case IMGFMT_XVMC_IDCT_MPEG2: case IMGFMT_XVMC_MOCO_MPEG2: if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; @@ -250,7 +250,7 @@ static int init(sh_video_t *sh){ ctx->avctx = avcodec_alloc_context(); avctx = ctx->avctx; -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC #ifdef CODEC_CAP_HWACCEL if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){ @@ -267,7 +267,7 @@ static int init(sh_video_t *sh){ avctx->draw_horiz_band = mc_render_slice; avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; }else -#endif /* HAVE_XVMC */ +#endif /* CONFIG_XVMC */ if(ctx->do_dr1){ avctx->flags|= CODEC_FLAG_EMU_EDGE; avctx->get_buffer= get_buffer; @@ -533,7 +533,7 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){ case PIX_FMT_RGB565: ctx->best_csp=IMGFMT_BGR16;break; //4xm case PIX_FMT_GRAY8: ctx->best_csp=IMGFMT_Y800;break; // gray jpeg case PIX_FMT_PAL8: ctx->best_csp=IMGFMT_BGR8;break; //8bps,mrle,cram -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC case PIX_FMT_XVMC_MPEG2_MC:ctx->best_csp=IMGFMT_XVMC_MOCO_MPEG2;break; case PIX_FMT_XVMC_MPEG2_IDCT:ctx->best_csp=IMGFMT_XVMC_IDCT_MPEG2;break; #endif @@ -910,7 +910,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC static enum PixelFormat get_format(struct AVCodecContext * avctx, const enum PixelFormat * fmt){ sh_video_t * sh = avctx->opaque; @@ -1070,4 +1070,4 @@ uint8_t *source[3]= {src->data[0], src->data[1], src->data[2]}; } -#endif // HAVE_XVMC +#endif /* CONFIG_XVMC */ diff --git a/libvo/video_out.c b/libvo/video_out.c index d2209a5175..1bf03dc36d 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -225,7 +225,7 @@ const vo_functions_t* const video_out_drivers[] = #endif &video_out_null, // should not be auto-selected -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC &video_out_xvmc, #endif &video_out_mpegpes, -- cgit v1.2.3 From 9b9b9f8002b57ca27e22e179a32f0a07a6e90b08 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 16 Dec 2008 05:19:11 +0000 Subject: Added FOURCCS: RPZA,AZPR to ffrpza DVX3 to ffdivx INMC to ffodivx and xvid QIVG to ffmjpeg Added binary codecs: GMP4,GM40 to Geovision MPEG4 XJPG to Xiricam JPEG SP60,SP61,SP62 to SP6x Codec SMSV to WorldConnect Wavelet Codec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28155 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/etc/codecs.conf b/etc/codecs.conf index bb9a7a2329..4e5fd4617b 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -417,7 +417,7 @@ videocodec ffqtrle videocodec ffrpza info "QuickTime Apple Video" status working - fourcc rpza,azpr + fourcc rpza,azpr,RPZA,AZPR driver ffmpeg dll "rpza" out BGR15 @@ -703,6 +703,7 @@ videocodec ffdivx fourcc AP41 div3 ; AngelPotion stuff fourcc COL1,col1,COL0,col0 ; Cool codec (based on mpg4ds32.ax) fourcc 3IVD,3ivd ; divxdoctored files (3ivx.com) + fourcc DVX3 driver ffmpeg dll msmpeg4 out YV12,I420,IYUV @@ -804,7 +805,7 @@ videocodec ffodivx fourcc FVFW,fvfw fourcc FFDS fourcc DCOD,MVXM,EM4A,PM4V - fourcc M4T3,DMK2,DIGI + fourcc M4T3,DMK2,DIGI,INMC driver ffmpeg dll mpeg4 ;opendivx out YV12,I420,IYUV @@ -854,7 +855,7 @@ videocodec xvid fourcc VIDM ; vidm 4.01 codec fourcc FFDS fourcc DCOD,MVXM,EM4A,PM4V - fourcc M4T3,DMK2,DIGI + fourcc M4T3,DMK2,DIGI,INMC format 0x10000004 ; mpeg 4 es driver xvid out YV12 @@ -1038,6 +1039,13 @@ videocodec ubmp4 out I420 out UYVY +videocodec geomp4 + info "GeoVision Advanced MPEG-4" + status working + fourcc GMP4,GM40 + driver vfw + dll "GXAMP4.dll" + out BGR24 flip ; MJPEG: ; Notes: m3jpeg+mjpeg are MMX optimized. avid is very stable but slow. @@ -1066,7 +1074,7 @@ videocodec ffmjpeg fourcc LJPG ; lossless JPEG fourcc dmb1 ; MJPEG by Matrox Rainbow Runner fourcc MJLS ; JPEG-LS custom FOURCC for avi - encoder - fourcc MMJP + fourcc MMJP,QIVG fourcc ACDV ; ACDSee jpeg driver ffmpeg dll mjpeg @@ -1848,6 +1856,14 @@ videocodec CJPG out UYVY out BGR24,BGR15 +videocodec xjpg + info "xiricam Veo PC Camera" + status working + fourcc XJPG + driver vfw + dll "camfc.dll" + out BGR24 flip + videocodec ffduck info "Duck Truemotion1" status working @@ -1899,6 +1915,14 @@ videocodec ffsp5x dll "sp5x" out YV12 +videocodec sp6x + info "SP6x codec" + status buggy + fourcc SP60,SP61,SP62 + driver vfw + dll "sp6x_32.dll" + out BGR24 flip + videocodec sp5x info "SP5x codec - used by Aiptek MegaCam" status working @@ -1972,6 +1996,15 @@ videocodec eyecon dll "nub2.dll" out YV12,YUY2 +videocodec smsvvfw + info "WorldConnect Wavelet Video" + comment "found in visualmail videos" + status working + fourcc SMSV + driver vfw + dll "wv32vfw.dll" + out BGR24 flip + videocodec foxmotion info "fox motion video" status working -- cgit v1.2.3 From b664d474d29edceda2639b59b4ff26908728695c Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Dec 2008 00:06:03 +0000 Subject: #include sub.h instead of locally declaring vo_draw_text(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28156 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index 63b8c3ca70..224af242c2 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -37,6 +37,7 @@ #include "aspect.h" #include "geometry.h" #include "mp_fifo.h" +#include "sub.h" #ifdef CONFIG_GUI #include "gui/interface.h" @@ -89,7 +90,6 @@ static float window_aspect; static BOOL (WINAPI* myGetMonitorInfo)(HMONITOR, LPMONITORINFO) = NULL; static RECT last_rect = {0xDEADC0DE, 0xDEADC0DE, 0xDEADC0DE, 0xDEADC0DE}; -void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); extern int vidmode; /***************************************************************************** -- cgit v1.2.3 From 762197410a6598509a1c5f1ffb2d06d0aed8d25a Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Dec 2008 00:08:04 +0000 Subject: Do not use full relative #include path for headers in the same directory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28157 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_quartz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index 5ed5279fcc..b649c442b4 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -30,7 +30,7 @@ #include "m_option.h" #include "mp_fifo.h" #include "mpbswap.h" -#include "libvo/sub.h" +#include "sub.h" #include "input/input.h" #include "input/mouse.h" -- cgit v1.2.3 From e3f05c124748cabe3980e9f7066923baee896cf9 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Dec 2008 01:10:34 +0000 Subject: libavcodec/armv4l/ was renamed to libavcodec/arm/. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28158 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e53037cc4c..6697f02cc8 100644 --- a/Makefile +++ b/Makefile @@ -723,7 +723,7 @@ DIRS = . \ libass \ libavcodec \ libavcodec/alpha \ - libavcodec/armv4l \ + libavcodec/arm \ libavcodec/bfin \ libavcodec/i386 \ libavcodec/mlib \ -- cgit v1.2.3 From 42a8a5a388888a6581bf61cc3e1de87dbb4a1b07 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Dec 2008 08:47:01 +0000 Subject: another round of armv4l --> arm changes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28159 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- configure | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6697f02cc8..c6c376326f 100644 --- a/Makefile +++ b/Makefile @@ -354,7 +354,7 @@ SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \ libmpeg2/slice.c SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ALPHA) += libmpeg2/idct_alpha.c \ libmpeg2/motion_comp_alpha.c -SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ARMV4L) += libmpeg2/motion_comp_arm.c \ +SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ARM) += libmpeg2/motion_comp_arm.c \ libmpeg2/motion_comp_arm_s.S SRCS_COMMON-$(LIBMPEG2)-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \ libmpeg2/motion_comp_altivec.c diff --git a/configure b/configure index 652694ffae..51f49fe0fb 100755 --- a/configure +++ b/configure @@ -1681,7 +1681,7 @@ EOF fi -_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM ARMV4L SH POWERPC PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC' +_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM SH POWERPC PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC' case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) _arch='X86 X86_32' @@ -2032,8 +2032,8 @@ EOF ;; arm|armv4l|armv5tel) - _arch='ARM ARMV4L' - _target_arch='ARCH_ARMV4L = yes' + _arch='ARM' + _target_arch='ARCH_ARM = yes' iproc='arm' ;; -- cgit v1.2.3 From 34f989f5e8e787bb1879bb50e17b15a39b17511c Mon Sep 17 00:00:00 2001 From: compn Date: Wed, 17 Dec 2008 14:52:46 +0000 Subject: add binary codec for fourcc wavc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28160 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/etc/codecs.conf b/etc/codecs.conf index 4e5fd4617b..cd503f82fd 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1784,6 +1784,14 @@ videocodec mwv1 dll "icmw_32.dll" out BGR24,BGR15 flip +videocodec wavcvfw + info "centre for wavelets, approximation and infromation processing" + status working + fourcc wavc + driver vfw + dll "WavCWAIP.dll" + out BGR24 flip + videocodec asv2 info "ASUS V2" status working -- cgit v1.2.3 From 9000a532c3f83013b54eb7b39b0497a2a591f6b6 Mon Sep 17 00:00:00 2001 From: Gabrov Date: Wed, 17 Dec 2008 16:12:12 +0000 Subject: synced with r28160 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28161 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/hu/mplayer.1 | 21 ++++++++++++++++----- DOCS/xml/hu/install.xml | 4 ++-- DOCS/xml/hu/ports.xml | 6 +++--- help/help_mp-hu.h | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1 index 473451b3b8..2d76734f79 100644 --- a/DOCS/man/hu/mplayer.1 +++ b/DOCS/man/hu/mplayer.1 @@ -1,4 +1,4 @@ -.\" Synced with r28056 +.\" Synced with r28126 .\" MPlayer (C) 2000-2008 MPlayer Team .\" Ezt a man oldalt Gabucino, Diego Biurrun és Jonas Jermann készíti/készítette .\" Karbantartó: Gabrov @@ -33,7 +33,7 @@ .\" Név .\" -------------------------------------------------------------------------- . -.TH MPlayer 1 "2008. 12. 05." "MPlayer Project" "A film lejátszó" +.TH MPlayer 1 "2008. 12. 17." "MPlayer Project" "A film lejátszó" . .SH NÉV mplayer \- film lejátszó @@ -3640,7 +3640,7 @@ haszn direct rendering támogatását. Az optimális sebességhez próbálj ki valami ehhez hasonlót .br -\-vo gl:yuv=2:force\-pbo:ati\-hack \-dr \-noslices +\-vo gl:yuv=2:rectangle=2:force\-pbo:ati\-hack \-dr \-noslices .br A kód nagyon kevés ellenőrzést végez, így ha egy tulajdonság nem elérhető, az azért lehet, mert a kártyád/OpenGL implementációd nem támogatja, akkor sem, ha @@ -3738,6 +3738,9 @@ be A gamma külön állítható a vörös, zöld és kék színre. A sebessége jobban függ a GPU memória sávszélességétől, mint a többi módszernél. .RE +.IPs ycbcr +Használja a GL_MESA_ycbcr_texture bővítményt a YUV-RGB konverzióknál. +A legtöbb esetben ez valószínűleg lassabb, mint az RGB-be történő szoftveres konverzió. .IPs lscale= Kiválasztja a használandó méretező függvényt a fényerősséghez. Csak a 2-es, 3-as, 4-es és 6-os yuv módoknál helyes. @@ -3754,13 +3757,17 @@ Egy kicsit t 3: Ugyan az, mint az 1, de nem használ texturát. Néhány kártyán gyorsabb lehet. .br -4: Kísérleti életlenítő maszkot használ 3x3 támogatással és 0.5-ös erősséggel. +4: Kísérleti életlenítő maszkot használ 3x3 támogatással és az alapértelmezett 0.5-ös erősséggel +(lásd filter-strength). .br -5: Kísérleti életlenítő maszkot használ 5x5 támogatással és 0.5-ös erősséggel. +5: Kísérleti életlenítő maszkot használ 5x5 támogatással és az alapértelmezett 0.5-ös erősséggel +(lásd filter-strength). .RE .IPs cscale= Kiválasztja a használandó méretező függvényt a színességhez. A részletekért lásd a lscale-t. +.IPs filter-strength=<érték> +Beállítja a lscale/cscale szűrők erősségét, ahol ez támogatott. .IPs customprog= Saját fragmentum programot tölt be a -ből. Lásd a TOOLS/edgedect.fp fájl példáért. @@ -4243,6 +4250,10 @@ Megadja a t 0-val nincs tömörítés, 9 a maximális tömörítés. .IPs outdir= Megadja a könyvtárat, ahova a PNG fájlokat menteni kell (alapértelmezett: ./). +.IPs alpha (alapértelmezett: noalpha) +Alfa csatornás PNG fájlok létrehozása. +Ne feledd, hogy az MPlayer általában nem támogatja az alfát, ezért ez csak +néhány ritka esetben hasznos. .RE .PD 1 . diff --git a/DOCS/xml/hu/install.xml b/DOCS/xml/hu/install.xml index 9678f4ef14..4785480d7d 100644 --- a/DOCS/xml/hu/install.xml +++ b/DOCS/xml/hu/install.xml @@ -1,5 +1,5 @@ - + TelepĂ­tĂ©s @@ -443,7 +443,7 @@ Ha inkább a kĂĽlsĹ‘ fĂĽggvĂ©nykönyvtárat használnád, telepĂ­tsd Ă©s add meg FAAD2 binárisok nem tölthetĹ‘ek le az audiocoding.com-rĂłl, de (apt-)get-tel telepĂ­theted Christian Marillat Debian csomagjait, vagy Mandrake/Mandriva RPM-et a P.L.F-rĹ‘l, -Fedora RPM-et pedig a Livna-rĂłl. +Fedora/CentOS/RHEL RPM-et pedig az RPMFusion-rĂłl. Ha Ăşgy döntesz, hogy forrásbĂłl fordĂ­tasz, nem kell a teljes FAAD2 az AAC fájlok diff --git a/DOCS/xml/hu/ports.xml b/DOCS/xml/hu/ports.xml index 984aeab0f5..82ff527396 100644 --- a/DOCS/xml/hu/ports.xml +++ b/DOCS/xml/hu/ports.xml @@ -1,5 +1,5 @@ - + Portok @@ -61,8 +61,8 @@ a bináris codec csomagokbĂłl, melyek akár az apt-get segĂ­tsĂ©gĂ©vel is telep Dominik Mierzejewski tartja karban az MPlayer -hivatalos RPM csomagjait a Fedora Core-hoz. ElĂ©rhetĹ‘ek -a Livna repository-ban. +hivatalos RPM csomagjait a Fedora-hoz Ă©s CentOS/RHEL-hez. ElĂ©rhetĹ‘ek +a RPMFusion repository-ban. diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h index 6b33d9e93c..a3e7d02e4f 100644 --- a/help/help_mp-hu.h +++ b/help/help_mp-hu.h @@ -3,7 +3,7 @@ //... Okay enough of the hw, now send the other two! // // Updated by: Gabrov -// Sync'ed with help_mp-en.h r27967 (2008. 12. 05.) +// Sync'ed with help_mp-en.h r28122 (2008. 12. 17.) // ========================= MPlayer help =========================== -- cgit v1.2.3 From b8830753f103748e8faa630ba636c845263906ce Mon Sep 17 00:00:00 2001 From: compn Date: Wed, 17 Dec 2008 20:54:25 +0000 Subject: add binary codecs: yuv8 - yuv8 vfw decoder WCMV - Wincam Screen capture codec AJPG,ABYR - Kensington videocam codec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28162 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/etc/codecs.conf b/etc/codecs.conf index cd503f82fd..57bbc5a0b7 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -66,6 +66,15 @@ videocodec zmbv dll "zmbv.dll" out BGR24,BGR15,BGR8 query,flip +videocodec yuv8 + info "YUV422 = Cb0 Y0 Cr0 Y1 Cb1 Y2 Cr1 Y3 (U Y V Y U Y V Y)" + status working + fourcc yuv8 + driver vfwex + dll "kdvyuv8.dll" ; i wonder if this works with raw codecs? + out YV12,I420,UYVY + out BGR24,BGR15,BGR32 + videocodec blackmagic info "Blackmagic 10-bit" status working @@ -495,6 +504,15 @@ videocodec msuscls dll "SCLS.DLL" out BGR32,BGR24,BGR16 flip +videocodec wincam + info "wincam screen capture codec" + comment "requires Zlib.dll" + status working + fourcc WCMV + driver vfw + dll "wcmv.dll" ; requires Zlib.dll + out BGR15 flip + videocodec cram info "Microsoft Video 1" comment "-vf palette required for 8bpp" @@ -1854,8 +1872,9 @@ videocodec vcr2 out YV12 out BGR24 -videocodec CJPG - info "CJPG" +videocodec cjpg + info "Creative Labs Video Blaster Webcam" + comment "sequential jpeg files?" status working fourcc CJPG driver vfw @@ -1864,6 +1883,16 @@ videocodec CJPG out UYVY out BGR24,BGR15 +videocodec kensington + info "kensington webcam" + status working + fourcc AJPG,ABYR + fourcc LBYR,JBYR ; untested, creative labs cam + fourcc UV12 ; untested + driver vfw + dll "aoxdxipl.ax" + out BGR24 flip + videocodec xjpg info "xiricam Veo PC Camera" status working -- cgit v1.2.3