From aaba0aea70cd015598e90596e0773ec3b2a3a0b6 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Thu, 13 May 2010 20:48:55 +0000 Subject: Silence a gcc warning about char trying to be packed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31172 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/wine/winbase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine/winbase.h b/loader/wine/winbase.h index a8fe81ee3f..19394bc81d 100644 --- a/loader/wine/winbase.h +++ b/loader/wine/winbase.h @@ -537,7 +537,7 @@ typedef struct UINT16 flags; DWORD dwOptions WINE_PACKED; DWORD dwFilter WINE_PACKED; - CHAR achAllocModule[8] WINE_PACKED; + CHAR achAllocModule[8]; DWORD dwAllocBreak WINE_PACKED; DWORD dwAllocCount WINE_PACKED; } WINDEBUGINFO, *LPWINDEBUGINFO; -- cgit v1.2.3 From e3f191fa3f6a708fab190410a383b854444af72b Mon Sep 17 00:00:00 2001 From: siretart Date: Fri, 14 May 2010 13:49:05 +0000 Subject: remove vf_yuy2, functionality is replaced by -vf format=yuv2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31173 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Changelog | 1 + DOCS/man/en/mplayer.1 | 9 +---- Makefile | 1 - libmpcodecs/vf_yuy2.c | 100 -------------------------------------------------- 4 files changed, 3 insertions(+), 108 deletions(-) delete mode 100644 libmpcodecs/vf_yuy2.c diff --git a/Changelog b/Changelog index 46493f30c6..1d30286b7b 100644 --- a/Changelog +++ b/Changelog @@ -121,6 +121,7 @@ MPlayer (1.0) * add af_scaletempo which maintains audio pitch when changing playback speed * fix multi-channel reordering * af_stats, filter to print information about the audio stream + * remove vf_yuy2, functionality is replaced by -vf format=yuv2 Streaming: * tv:// support for Windows diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index aceb18f509..9c5d7af513 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -4176,11 +4176,11 @@ Explicitly choose the Matrox device name to use (default: /dev/\:mga_vid). .PD 1 . .TP -.B s3fb (Linux only) (also see \-vf yuv2 and \-dr) +.B s3fb (Linux only) (also see \-dr) S3 Virge specific video output driver. This driver supports the card's YUV conversion and scaling, double buffering and direct rendering features. -Use \-vf yuy2 to get hardware-accelerated YUY2 rendering, which is +Use \-vf format=yuy2 to get hardware-accelerated YUY2 rendering, which is much faster than YV12 on this card. .PD 0 .RSs @@ -6071,11 +6071,6 @@ Rounds up to make both width and height divisible by (default: 1). .RE . .TP -.B "yuy2\ \ \ " -Forces software YV12/\:I420/\:422P to YUY2 conversion. -Useful for video cards/\:drivers with slow YV12 but fast YUY2 support. -. -.TP .B "yvu9\ \ \ " Forces software YVU9 to YV12 colorspace conversion. Deprecated in favor of the software scaler. diff --git a/Makefile b/Makefile index 1b2c99c0e9..2ed54e5045 100644 --- a/Makefile +++ b/Makefile @@ -463,7 +463,6 @@ SRCS_COMMON = asxparser.c \ libmpcodecs/vf_vo.c \ libmpcodecs/vf_yadif.c \ libmpcodecs/vf_yuvcsp.c \ - libmpcodecs/vf_yuy2.c \ libmpcodecs/vf_yvu9.c \ libmpdemux/aac_hdr.c \ libmpdemux/asfheader.c \ diff --git a/libmpcodecs/vf_yuy2.c b/libmpcodecs/vf_yuy2.c deleted file mode 100644 index 162671eaab..0000000000 --- a/libmpcodecs/vf_yuy2.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * 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 -#include - -#include "config.h" -#include "mp_msg.h" -#include "help_mp.h" - -#include "img_format.h" -#include "mp_image.h" -#include "vf.h" - -#include "libswscale/rgb2rgb.h" -#include "vf_scale.h" - -//===========================================================================// - -static int config(struct vf_instance *vf, - int width, int height, int d_width, int d_height, - unsigned int flags, unsigned int outfmt){ - - sws_rgb2rgb_init(get_sws_cpuflags()); - - if(vf_next_query_format(vf,IMGFMT_YUY2)<=0){ - mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_WarnNextFilterDoesntSupport, "YUY2"); - return 0; - } - - return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YUY2); -} - -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ - mp_image_t *dmpi; - - // hope we'll get DR buffer: - dmpi=vf_get_image(vf->next,IMGFMT_YUY2, - MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, - mpi->w, mpi->h); - - if(mpi->imgfmt==IMGFMT_422P) - yuv422ptoyuy2(mpi->planes[0],mpi->planes[1],mpi->planes[2], dmpi->planes[0], - mpi->w,mpi->h, mpi->stride[0],mpi->stride[1],dmpi->stride[0]); - else - yv12toyuy2(mpi->planes[0],mpi->planes[1],mpi->planes[2], dmpi->planes[0], - mpi->w,mpi->h, mpi->stride[0],mpi->stride[1],dmpi->stride[0]); - - vf_clone_mpi_attributes(dmpi, mpi); - - return vf_next_put_image(vf,dmpi, pts); -} - -//===========================================================================// - -static int query_format(struct vf_instance *vf, unsigned int fmt){ - switch(fmt){ - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: - case IMGFMT_422P: - return vf_next_query_format(vf,IMGFMT_YUY2) & (~VFCAP_CSP_SUPPORTED_BY_HW); - } - return 0; -} - -static int vf_open(vf_instance_t *vf, char *args){ - vf->config=config; - vf->put_image=put_image; - vf->query_format=query_format; - return 1; -} - -const vf_info_t vf_info_yuy2 = { - "fast YV12/Y422p -> YUY2 conversion", - "yuy2", - "A'rpi", - "", - vf_open, - NULL -}; - -//===========================================================================// -- cgit v1.2.3 From 2b26048ccaf9a71d552e147b623f270422e56730 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Fri, 14 May 2010 14:20:19 +0000 Subject: Fix compilation after r31173. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31174 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 0760b09602..64d1696be4 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -51,7 +51,6 @@ extern const vf_info_t vf_info_pp; extern const vf_info_t vf_info_scale; extern const vf_info_t vf_info_format; extern const vf_info_t vf_info_noformat; -extern const vf_info_t vf_info_yuy2; extern const vf_info_t vf_info_flip; extern const vf_info_t vf_info_rgb2bgr; extern const vf_info_t vf_info_rotate; @@ -137,7 +136,6 @@ static const vf_info_t* const filter_list[]={ &vf_info_vo, &vf_info_format, &vf_info_noformat, - &vf_info_yuy2, &vf_info_flip, &vf_info_rgb2bgr, &vf_info_rotate, -- cgit v1.2.3 From b6bcfb4f006c81980e8c16127e7a516cfa89a6fb Mon Sep 17 00:00:00 2001 From: cehoyos Date: Fri, 14 May 2010 14:24:16 +0000 Subject: Enable libavcodecs new MPEG-1 Audio float decoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31175 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/etc/codecs.conf b/etc/codecs.conf index 2f4b1ad656..aefb741985 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4132,6 +4132,13 @@ audiocodec mp3 fourcc "LAME" ; used in mythtv .nuv files driver mp3lib +audiocodec ffmp3on4float + info "FFmpeg Multi-channel MPEG layer-3 on MP4 audio" + status working + format 0x1d61346d ; 'm','4','a',29 internal MPlayer fourcc + driver ffmpeg + dll "mp3on4float" + audiocodec ffmp3on4 info "FFmpeg Multi-channel MPEG layer-3 on MP4 audio" status working @@ -4139,6 +4146,19 @@ audiocodec ffmp3on4 driver ffmpeg dll "mp3on4" +audiocodec ffmp3float + info "FFmpeg MPEG layer-3 audio" + comment "integer only" + status working + format 0x55 + format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) + format 0x55005354 ; broken file + fourcc ".mp3" ; CBR/VBR MP3 (MOV files) + fourcc "MP3 " ; used in .nsv files + fourcc "LAME" ; used in mythtv .nuv files + driver ffmpeg + dll "mp3float" + audiocodec ffmp3 info "FFmpeg MPEG layer-3 audio" comment "integer only" @@ -4152,6 +4172,14 @@ audiocodec ffmp3 driver ffmpeg dll "mp3" +audiocodec ffmp3adufloat + info "FFmpeg MPEG layer-3 adu audio" + comment "integer only" + status working + format 0x55756461 ; 'a','d','u',0x55 internal MPlayer fourcc + driver ffmpeg + dll "mp3adufloat" + audiocodec ffmp3adu info "FFmpeg MPEG layer-3 adu audio" comment "integer only" @@ -4160,6 +4188,17 @@ audiocodec ffmp3adu driver ffmpeg dll "mp3adu" +audiocodec ffmp2float + info "FFmpeg MPEG layer-1 and layer-2 audio" + comment "integer only" + status working + format 0x50 + format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files) + fourcc ".mp2" ; MP2 (MOV files) + fourcc ".mp1" ; MP1 (MOV files) + driver ffmpeg + dll "mp2float" + audiocodec ffmp2 info "FFmpeg MPEG layer-1 and layer-2 audio" comment "integer only" -- cgit v1.2.3 From 0a33fdb83a5488744e3a148d1a09801850135a56 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 14 May 2010 15:34:30 +0000 Subject: Check for termios.h before sys/termios.h. The former location is the more current and standard variant. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31176 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 1f0e1a29fb..29dadcca53 100755 --- a/configure +++ b/configure @@ -3855,7 +3855,7 @@ def_termios_h='#undef HAVE_TERMIOS_H' def_termios_sys_h='#undef HAVE_SYS_TERMIOS_H' if test "$_termios" = auto ; then _termios=no - for _termios_header in "sys/termios.h" "termios.h"; do + for _termios_header in "termios.h" "sys/termios.h"; do cat > $TMPC < int main(void) { return 0; } -- cgit v1.2.3