head 1.11; access; symbols pkgsrc-2013Q2:1.11.0.4 pkgsrc-2013Q2-base:1.11 pkgsrc-2012Q4:1.11.0.2 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q1:1.10.0.14 pkgsrc-2012Q1-base:1.10 pkgsrc-2011Q4:1.10.0.12 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q3:1.10.0.10 pkgsrc-2011Q3-base:1.10 pkgsrc-2011Q2:1.10.0.8 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.10.0.6 pkgsrc-2011Q1-base:1.10 pkgsrc-2010Q4:1.10.0.4 pkgsrc-2010Q4-base:1.10 pkgsrc-2010Q3:1.10.0.2 pkgsrc-2010Q2:1.8.0.6 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.4 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.2 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.6.0.32 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.30 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.28 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.26 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.24 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.22 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.20 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.18 pkgsrc-2008Q1:1.6.0.16 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.14 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.12 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.10 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.8 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.6 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.4 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.2 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.5.0.8 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.6 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.4 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.2 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.3.0.6 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.4 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.2 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.11 date 2012.06.11.13.41.12; author wiz; state dead; branches; next 1.10; 1.10 date 2010.11.23.12.31.30; author tron; state Exp; branches 1.10.2.1; next 1.9; 1.9 date 2010.09.16.18.56.12; author wiz; state dead; branches; next 1.8; 1.8 date 2009.11.07.18.43.37; author hasso; state Exp; branches; next 1.7; 1.7 date 2009.10.18.22.22.10; author ahoka; state dead; branches; next 1.6; 1.6 date 2006.06.13.17.25.00; author drochner; state Exp; branches; next 1.5; 1.5 date 2005.05.31.19.15.11; author jmmv; state Exp; branches; next 1.4; 1.4 date 2005.05.30.12.43.30; author wiz; state Exp; branches; next 1.3; 1.3 date 2004.07.24.01.19.35; author wiz; state Exp; branches; next 1.2; 1.2 date 2004.04.28.15.54.46; author wiz; state dead; branches; next 1.1; 1.1 date 2004.01.26.12.06.43; author jmmv; state Exp; branches 1.1.1.1; next ; 1.10.2.1 date 2010.11.23.12.31.30; author spz; state dead; branches; next 1.10.2.2; 1.10.2.2 date 2010.11.24.20.34.24; author spz; state Exp; branches; next ; 1.1.1.1 date 2004.01.26.12.06.43; author jmmv; state Exp; branches; next ; desc @@ 1.11 log @Update mplayer packages to 1.1, provided by Leonardo Taccari in PR 46566. Pkgsrc changes: * Fix some pkglint(1) warnings (no functional changes intended) * Modified options.mk in order to always enable or disable a PKG_SUPPORTED_OPTION (for more information please give a look to the second "Note" of options.mk) * Removed the mplayer-internal-faad PKG_SUPPORTED_OPTION, now faad support is only enabled via audio/faad2. * Changed MASTER_SITES, now MPlayer distfile is fetched directly from its mirror. MPlayer changes: 1.1: "We gave up on 1.0" Decoders: * FFmpeg AAC decoder is now preferred over libfaad2 and the internal libfaad2 forked copy has been removed in its favor Demuxers: * experimental support for using binary Quicktime codecs with -demuxer lavf. * correct runtime and average bitrate for VBR (variable bitrate) MP3 Filters: * delogo: allow to change the rectangle based on the time. * lavfi: libavfilter filter graphs (experimental). Other: * support adding noise at output resolution with -vo gl:noise-strength=8 * experimental support for OpenGL ES 1.0 in -vo gl * support for PGS (BluRay-compatible), DVB and XSUB subtitles. * af_cmdline slave command to change e.g. audio equalizer options at runtime. * vo x11: don't hide or show cursor any more if attached to an existing window (-wid) * try reconnecting network streams e.g. after network timeouts * lots of bug fixes as always (and surely a few new bugs, too :-( ) GUI: Support for the GUI continues. * numerous fixes, improvements and updates * UTF-8 support * all skin messages available as slave commands (gui ) * fancy new icon Ports: * Wine (see DOCS/tech/crosscompile.txt) MEncoder: * -force-key-frames option to set explicit seek points. MPlayer (1.0) rc4: "Yes We Can" GUI: Changes towards removing the GUI * The GUI will no longer display any error or warning messages. * Special GUI slave commands (gui_*) were removed, along with the related key bindings. Decoders: * YUY2 Lossless Codec (YLC0) via binary DLL * Truemotion RT codec (TR20) via binary DLL * Nogantech Codec (NTN1 and NTN2) via binary DLL * add new FourCCs (m1v1, yuvs, VYUY, Y42B, V422, YUNV, UYNV, UYNY, uyv1, 2Vu1, P422, HDYC, IJLV, MVJP) TwoCCs (0xA106, 0x6c75, 0xAAC0, 0x55005354) to existing decoders * AMR now handled via OpenCORE decoder * updated Windows Media Screen Codec (MSS1, MSS2) via binary DLL * CoreAVC H.264 decoder via binary DLL (Windows only) * Kega Game video codec (KGV1) via binary DLL * SoftLab-NSK Forward MPEG-2 I-frames (SLIF) via binary DLL * JPEG 2000 support via OpenJPEG * internal liba52 copy removed * CineForm HD (CFHD) via binary DLL * VP8 en-/decoding through libvpx wrapper and native decoder in FFmpeg * support for external libmpeg2 added * hardware MPEG decoder priority lowered * external libmpg123 support Demuxers: * Mostly fixed timing issues with some H.264 (PAFF) samples * Matroska and Ogg demuxers switched to use libavformat by default. Report issues and use -demuxer ogg and -demuxer mkv to work around them. * support for TrueHD in Blu-ray streams in libmpdemux * more Blu-ray codec support with lavf * fix length in ASF/WMV files * support ISDB-Tb DVB streams Filters: * remove vf_yuy2, functionality is replaced by -vf format=yuv2 * remove vf_rgb2bgr, functionality is replaced by sws and vf_format Streaming: * Support for unencrypted Blu-ray playback through libbluray. Use it through: mplayer br:////path/to/disc Drivers: * -vo yuv4mpeg:interlaced no longer does its own interlaced RGB->YUV conversion. Use -vf scale=::1 to keep the same behavior and report if there are any issues with that. * X11: Window manager chooses Window position by default. Add geometry=50%:50% to your configuration to get the old behavior. * -vo md5sum md5 calculation changed so output matches FFmpeg's -f framemd5 * Support for more formats in OpenGL video output drivers (different YUV subsampling, 16 bit per component) * Selectable YUV to RGB conversion standard for -vo gl (-vo gl:colorspace=...:levelconv=...) * -vo gl now tries to use yuv=2 by default if possible * -vo gl:stereo=... for experimental stereo (3D) support * -vo matrixview finally added * add OS/2 KAI audio driver (-ao kai) Other: * -nosub option for disabling auto-selected subtitles * support for displaying subs in the terminal (FIXME) * support for subtitles with audio-only files * support for right-to-left languages with embedded subtitles * support for UTF-16 encoded external subtitles * support for 8 channel audio * sync dvd:// and dvdnav:// features * support for MPEG-4 ASP in VDPAU video output (non-B-frame only) * support for live and non-live DVB teletext with demuxer lavf * -name, -title and -use-filename-title options for MPlayer * support for stream handling via FFmpeg, in particular RTMP and RTSP (use e.g. ffmpeg://http://example.com/test) * experimental support for external libass, configure with --disable-ass-internal * better support for 16-bit-per-component formats and formats with alpha channel * better out-of-the-box support for compiling for ARM, IA64, MinGW32 and MinGW-w64, MinGW has ASLR enabled with recent enough binutils * libdvdcss synced with upstream Subversion snapshot MEncoder: * add -tsprog for demuxer lavf @ text @$NetBSD: patch-ab,v 1.10 2010/11/23 12:31:30 tron Exp $ Fix for CVE-2010-3429 taken from here: http://git.ffmpeg.org/?p=ffmpeg;a=commitdiff;h=16c592155f117ccd7b86006c45aacc692a81c23b;hp=2abacdf610d598073838a7e72698b8421461aead --- libavcodec/flicvideo.c.orig 2010-04-20 15:45:34.000000000 +0100 +++ libavcodec/flicvideo.c 2010-11-23 12:14:07.000000000 +0000 @@@@ -159,7 +159,7 @@@@ int pixel_skip; int pixel_countdown; unsigned char *pixels; - int pixel_limit; + unsigned int pixel_limit; s->frame.reference = 1; s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; @@@@ -253,10 +253,13 @@@@ av_log(avctx, AV_LOG_ERROR, "Undefined opcode (%x) in DELTA_FLI\n", line_packets); } else if ((line_packets & 0xC000) == 0x8000) { // "last byte" opcode - pixels[y_ptr + s->frame.linesize[0] - 1] = line_packets & 0xff; + pixel_ptr= y_ptr + s->frame.linesize[0] - 1; + CHECK_PIXEL_PTR(0); + pixels[pixel_ptr] = line_packets & 0xff; } else { compressed_lines--; pixel_ptr = y_ptr; + CHECK_PIXEL_PTR(0); pixel_countdown = s->avctx->width; for (i = 0; i < line_packets; i++) { /* account for the skip bytes */ @@@@ -268,7 +271,7 @@@@ byte_run = -byte_run; palette_idx1 = buf[stream_ptr++]; palette_idx2 = buf[stream_ptr++]; - CHECK_PIXEL_PTR(byte_run); + CHECK_PIXEL_PTR(byte_run * 2); for (j = 0; j < byte_run; j++, pixel_countdown -= 2) { pixels[pixel_ptr++] = palette_idx1; pixels[pixel_ptr++] = palette_idx2; @@@@ -298,6 +301,7 @@@@ stream_ptr += 2; while (compressed_lines > 0) { pixel_ptr = y_ptr; + CHECK_PIXEL_PTR(0); pixel_countdown = s->avctx->width; line_packets = buf[stream_ptr++]; if (line_packets > 0) { @@@@ -453,7 +457,7 @@@@ int pixel_countdown; unsigned char *pixels; int pixel; - int pixel_limit; + unsigned int pixel_limit; s->frame.reference = 1; s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; @@@@ -503,6 +507,7 @@@@ } else { compressed_lines--; pixel_ptr = y_ptr; + CHECK_PIXEL_PTR(0); pixel_countdown = s->avctx->width; for (i = 0; i < line_packets; i++) { /* account for the skip bytes */ @@@@ -514,13 +519,13 @@@@ byte_run = -byte_run; pixel = AV_RL16(&buf[stream_ptr]); stream_ptr += 2; - CHECK_PIXEL_PTR(byte_run); + CHECK_PIXEL_PTR(2 * byte_run); for (j = 0; j < byte_run; j++, pixel_countdown -= 2) { *((signed short*)(&pixels[pixel_ptr])) = pixel; pixel_ptr += 2; } } else { - CHECK_PIXEL_PTR(byte_run); + CHECK_PIXEL_PTR(2 * byte_run); for (j = 0; j < byte_run; j++, pixel_countdown--) { *((signed short*)(&pixels[pixel_ptr])) = AV_RL16(&buf[stream_ptr]); stream_ptr += 2; @@@@ -611,7 +616,7 @@@@ if (byte_run > 0) { pixel = AV_RL16(&buf[stream_ptr]); stream_ptr += 2; - CHECK_PIXEL_PTR(byte_run); + CHECK_PIXEL_PTR(2 * byte_run); for (j = 0; j < byte_run; j++) { *((signed short*)(&pixels[pixel_ptr])) = pixel; pixel_ptr += 2; @@@@ -622,7 +627,7 @@@@ } } else { /* copy pixels if byte_run < 0 */ byte_run = -byte_run; - CHECK_PIXEL_PTR(byte_run); + CHECK_PIXEL_PTR(2 * byte_run); for (j = 0; j < byte_run; j++) { *((signed short*)(&pixels[pixel_ptr])) = AV_RL16(&buf[stream_ptr]); stream_ptr += 2; @ 1.10 log @Add fix for the vulnerability reported in CVE-2010-3429 taken from MPlayer's GIT repository. @ text @d1 1 a1 1 $NetBSD$ @ 1.10.2.1 log @file patch-ab was added on branch pkgsrc-2010Q3 on 2010-11-24 20:34:24 +0000 @ text @d1 100 @ 1.10.2.2 log @Pullup ticket 3283 - requested by tron security fixes Revisions pulled up: - pkgsrc/multimedia/gmplayer/Makefile 1.86 - pkgsrc/multimedia/gmplayer/distinfo 1.70 - pkgsrc/multimedia/mencoder/Makefile 1.50 - pkgsrc/multimedia/mplayer/Makefile 1.73 - pkgsrc/multimedia/mplayer-share/distinfo 1.68 Files added: pkgsrc/multimedia/mplayer-share/patches/patch-ab ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Tue Nov 23 12:31:30 UTC 2010 Modified Files: pkgsrc/multimedia/gmplayer: Makefile distinfo pkgsrc/multimedia/mencoder: Makefile pkgsrc/multimedia/mplayer: Makefile pkgsrc/multimedia/mplayer-share: distinfo Added Files: pkgsrc/multimedia/mplayer-share/patches: patch-ab Log Message: Add fix for the vulnerability reported in CVE-2010-3429 taken from MPlayer's GIT repository. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 pkgsrc/multimedia/gmplayer/Makefile cvs rdiff -u -r1.69 -r1.70 pkgsrc/multimedia/gmplayer/distinfo cvs rdiff -u -r1.49 -r1.50 pkgsrc/multimedia/mencoder/Makefile cvs rdiff -u -r1.72 -r1.73 pkgsrc/multimedia/mplayer/Makefile cvs rdiff -u -r1.67 -r1.68 pkgsrc/multimedia/mplayer-share/distinfo cvs rdiff -u -r0 -r1.10 pkgsrc/multimedia/mplayer-share/patches/patch-ab @ text @a0 100 $NetBSD: patch-ab,v 1.10 2010/11/23 12:31:30 tron Exp $ Fix for CVE-2010-3429 taken from here: http://git.ffmpeg.org/?p=ffmpeg;a=commitdiff;h=16c592155f117ccd7b86006c45aacc692a81c23b;hp=2abacdf610d598073838a7e72698b8421461aead --- libavcodec/flicvideo.c.orig 2010-04-20 15:45:34.000000000 +0100 +++ libavcodec/flicvideo.c 2010-11-23 12:14:07.000000000 +0000 @@@@ -159,7 +159,7 @@@@ int pixel_skip; int pixel_countdown; unsigned char *pixels; - int pixel_limit; + unsigned int pixel_limit; s->frame.reference = 1; s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; @@@@ -253,10 +253,13 @@@@ av_log(avctx, AV_LOG_ERROR, "Undefined opcode (%x) in DELTA_FLI\n", line_packets); } else if ((line_packets & 0xC000) == 0x8000) { // "last byte" opcode - pixels[y_ptr + s->frame.linesize[0] - 1] = line_packets & 0xff; + pixel_ptr= y_ptr + s->frame.linesize[0] - 1; + CHECK_PIXEL_PTR(0); + pixels[pixel_ptr] = line_packets & 0xff; } else { compressed_lines--; pixel_ptr = y_ptr; + CHECK_PIXEL_PTR(0); pixel_countdown = s->avctx->width; for (i = 0; i < line_packets; i++) { /* account for the skip bytes */ @@@@ -268,7 +271,7 @@@@ byte_run = -byte_run; palette_idx1 = buf[stream_ptr++]; palette_idx2 = buf[stream_ptr++]; - CHECK_PIXEL_PTR(byte_run); + CHECK_PIXEL_PTR(byte_run * 2); for (j = 0; j < byte_run; j++, pixel_countdown -= 2) { pixels[pixel_ptr++] = palette_idx1; pixels[pixel_ptr++] = palette_idx2; @@@@ -298,6 +301,7 @@@@ stream_ptr += 2; while (compressed_lines > 0) { pixel_ptr = y_ptr; + CHECK_PIXEL_PTR(0); pixel_countdown = s->avctx->width; line_packets = buf[stream_ptr++]; if (line_packets > 0) { @@@@ -453,7 +457,7 @@@@ int pixel_countdown; unsigned char *pixels; int pixel; - int pixel_limit; + unsigned int pixel_limit; s->frame.reference = 1; s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; @@@@ -503,6 +507,7 @@@@ } else { compressed_lines--; pixel_ptr = y_ptr; + CHECK_PIXEL_PTR(0); pixel_countdown = s->avctx->width; for (i = 0; i < line_packets; i++) { /* account for the skip bytes */ @@@@ -514,13 +519,13 @@@@ byte_run = -byte_run; pixel = AV_RL16(&buf[stream_ptr]); stream_ptr += 2; - CHECK_PIXEL_PTR(byte_run); + CHECK_PIXEL_PTR(2 * byte_run); for (j = 0; j < byte_run; j++, pixel_countdown -= 2) { *((signed short*)(&pixels[pixel_ptr])) = pixel; pixel_ptr += 2; } } else { - CHECK_PIXEL_PTR(byte_run); + CHECK_PIXEL_PTR(2 * byte_run); for (j = 0; j < byte_run; j++, pixel_countdown--) { *((signed short*)(&pixels[pixel_ptr])) = AV_RL16(&buf[stream_ptr]); stream_ptr += 2; @@@@ -611,7 +616,7 @@@@ if (byte_run > 0) { pixel = AV_RL16(&buf[stream_ptr]); stream_ptr += 2; - CHECK_PIXEL_PTR(byte_run); + CHECK_PIXEL_PTR(2 * byte_run); for (j = 0; j < byte_run; j++) { *((signed short*)(&pixels[pixel_ptr])) = pixel; pixel_ptr += 2; @@@@ -622,7 +627,7 @@@@ } } else { /* copy pixels if byte_run < 0 */ byte_run = -byte_run; - CHECK_PIXEL_PTR(byte_run); + CHECK_PIXEL_PTR(2 * byte_run); for (j = 0; j < byte_run; j++) { *((signed short*)(&pixels[pixel_ptr])) = AV_RL16(&buf[stream_ptr]); stream_ptr += 2; @ 1.9 log @Update to 20100913, provided by Aleksey Cheusov via wip. One year of changes. Ok ahoka@@ @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.8 2009/11/07 18:43:37 hasso Exp $ d3 53 a55 5 --- libdvdread4/bswap.h.orig +++ libdvdread4/bswap.h @@@@ -61,7 +61,7 @@@@ #define B2N_32(x) x = swap32(x) #define B2N_64(x) x = swap64(x) d57 44 a100 5 -#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 +#elif (defined(__FreeBSD__) && __FreeBSD_version >= 470000) || defined(__DragonFly__) #include #define B2N_16(x) x = be16toh(x) #define B2N_32(x) x = be32toh(x) @ 1.8 log @Fix build on DragonFly. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Upgrade to the SVN snapshot as of 2009-10-17. The builtin libavcodec now uses yasm to assemble hand written h264 code. The older x264 we currently have in pkgsrc is not supported by mplayer, so I had to do some hand tweaking to make it work. It may contain bugs because of this, so report any fallouts with h264. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2006/06/13 17:25:00 drochner Exp $ d3 5 a7 3 --- loader/win32.c.orig 2006-06-11 20:35:46.000000000 +0200 +++ loader/win32.c @@@@ -451,8 +451,10 @@@@ static int my_release(void* memory) d9 5 a13 10 if (last_alloc) pthread_mutex_unlock(&memmut); - else + else { + pthread_mutex_unlock(&memmut); pthread_mutex_destroy(&memmut); + } //if (alccnt < 40000) printf("MY_RELEASE: %p\t%ld (%d)\n", header, header->size, alccnt); #else @ 1.6 log @update to 1.0pre8 too many changes to list here, see the ChangeLog most visible: security patches and DragonFly support were intrgrated upstream, new gmplayer look&feel (like it or not...) @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Apply a set of fixes to improve support of other OSes (specially DragonFly). All these changes are already in mplayer's repository. Patches provided by Joerg Sonnenberger in private mail. @ text @d1 1 a1 1 $NetBSD: pkgsrc/multimedia/mplayer-share/patches/patch-ab,v 1.4 2005/05/30 12:43:30 wiz Exp $ d3 1 a3 1 --- loader/win32.c.orig 2005-04-15 22:17:12.000000000 +0200 a16 9 @@@@ -993,7 +995,7 @@@@ /* disable cpuid based detection (mplayer's cpudetect.c does this - see above) */ #ifndef MPLAYER -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__) || defined(__DragonFly__) do_cpuid(1, regs); switch ((regs[0] >> 8) & 0xf) { // cpu family case 3: cachedsi.dwProcessorType = PROCESSOR_INTEL_386; @ 1.4 log @regen with updated line numbers @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2004/07/24 01:19:35 wiz Exp $ d17 9 @ 1.3 log @Unlocking a mutex before destroying it makes libpthread much happier. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- loader/win32.c.orig 2004-07-01 00:00:53.000000000 +0200 d5 1 a5 1 @@@@ -444,8 +444,10 @@@@ static int my_release(void* memory) @ 1.2 log @Update to 1.0pre4: MPlayer 1.0pre4: "YAML Counter" Security: * HTTP parser remote heap overflow vulnerability fixed [already fixed in package previously] * Real RTSP remote buffer overflow vulnerability fixed * buffer overflow in the Matroska demuxer * potentially exploitable buffer overflow in CDDB TOC code DOCS: * new Copyright file covers files from other projects and their licenses * new DOCS/tech/translations.txt explains how to properly translate MPlayer * new Japanese console message translation * Polish translation finished * Italian man page translation * DVD ripping guide * telecine/interlacing guide * video out driver section added to the man page * XML build system rewritten - now supports building individual languages * miscellaneous updates all over the place Ports: * better PA-RISC detection * support for VAX (tested on VAXstation 4000/VLC) -- really, believe me! * optimizing for specific MIPS CPUs under IRIX * AMD64 detection under BSDs * fbdev driver updated for Linux 2.6 * support for ELF only OpenBSD * optimizing for PPC 970 (aka G5) * SDL support fixed on MinGW * VIDIX working under Windows XP/2000 (native dhahelper) * builds out of the box under GNU Hurd * SSE optimizations enabled under MinGW * SSE support under OpenBSD * AltiVec support under NetBSD * GCC 3.4 support (due to changed behaviour in ASM code snippets) Demuxers: * Matroska containing RealVideo works better * fixed random segfaults in VIVO * endianess fixes in CDDA * UYVY support in tvi/v4l2 * tvi/bsdbt848 now working under FreeBSD 5.2-CURRENT * tvi/bsdbt848 audio part working under NetBSD * LIVE.COM demuxer updated to conform with latest libraries * new, independent, C implementation of the Matroska demuxer * fix for rare Real files * more robust Real demuxer (can resync after errors) * support for AAC inside Real * MPEG Aspect code 4 fixed * support for selecting subtitle streams with -slang inside Ogg * wrapper demuxer for FFMpeg's libavformat (Nut is playable this way) * much improved seeking in Ogg * Nullsoft streaming video (NSV) demuxer * AVI OpenDML read and write support Streaming: * smil playlist parser * support for URL redirection * support for seeking in HTTP streams * updated LIVE.COM streaming code * fallback to live.com RTSP after Real RTSP * suggests -playlist if normal streaming fails * many improvements and bug fixes in the streaming code Decoders: * compilation failure without zlib in vd/lcl fixed * removed obsoleted decoders (which were moved to libavcodec), affected: vd/8bps, vd/msrle, vd/msvideo1, vd/rpza, vd/smc * workaround for buggy codecs in ad/acm (support for Sharp G.726) * fixed chroma-swapping in Hauppauge Macroblock decoder * AltiVec optimized resampler in liba52 * support for VP5 and VP6 DLL decoders * support for Alparysoft lossless video codec (through DLLs) * support for Lead MCMW wavelet video codec (through DLLs) * HE-AAC working through libfaad * removed libmpflac in favor of FFmpeg's FLAC implementation * liba52 dynamic range compression support Filters: * vf_bmovl bugfixes * vf_filmdint now handles 15fps NTSC input * huge updates and speedup on vf_pullup * big updates to vf_ilpack (proper interpolation and MMX optimizations) * vf_zrmjpeg: fast MJPEG encoder using libavcodec for Zoran * interlaced scaling support in vf_scale * vf_kerndeint: adaptive deinterlacer * vf_rgbtest: rgb test pattern generator for developers * vf_qp: qp change filter * vf_noformat: the same as vf_format but with reversed meaning * AltiVec optimized SWScaler * vf_phase: phase shift fields * vf_divtc: duplicate frame removal from deinterlaced telecined video Drivers: * ao/esd behaves better over network now * support for Radeon 9200/9600/9600 Pro/9700 in VIDIX * -mixer support for alsa9 * fixed OSS audio grabber module with hardware not supporting 44khz * native ALSA 1.x support (not through 0.9 emulation) * better multibuffer support in VIDIX nVidia driver * pan & scan support in VIDIX nVidia driver * support for more cards in VIDIX nVidia driver * vo_libcaca: color ASCII art output driver * vo_quartz: native MacOS X/Quartz video output * support for VIDIX when ATI FireGLX drivers are used FFmpeg/libavcodec: * H.263 AIC and MQ encoding support * fixed low delay decoding * fixed H.263+ encoding without UMV * lots of CBR improvements * MB type and QP visualization * lots of code cleanup * intra & inter dequantization split -> speedup * fixed stereo IMA ADPCM encoding * VBV delay setting support (MPEG2 CBR) * improved RV20 decoder (most known errors eliminated) * interlaced DCT * interlaced motion estimation * interlaced MPEG2 encoding * 4MV encoding fixes * initial interlaced MPEG4 encoding * improved visual quality in SVQ3 decoder * fixed never-before-tested embedded string decoder in SVQ1 * optimized quantization (including the trellis way) * Sierra VMD video decoder * MMX and SSE2 optimized H263 denoiser * better SVCD compliance (encoder side) * MMX and MMX2 optimized interlaced DCT decision * various cleanup, memleak and segfault fixes * optimized (2x faster) the MPEG layer 3 decoder * grayscale coded MJPEG decoding support * avimszh and avizlib decoders * "packed" XviD decoding * fixed some bugs in RV20 B-frames decoding * closed GOP encoding * SSE2 optimized FDCT * support for quantizer noise shaping * support for EA ADPCM and SMJPEG IMA ADPCM * QT RLE decoder * OBMC fixes * FLAC decoder * better support for DivX5 * MMX and SSE2 optimized VP3/Theora decoding * support for Theora alpha3 * many H.264 improvements * more robust MJPEG startcode search mechanism * better WMV8 decoding * native Sparc VIS optimizations * native G.726 codec Others: * -codecs-file option for specifying alternative codecs.conf file * fixed some minor bugs in the GUI * prevent sig11 when $HOME is not set * fix some command line handling corruptions * Swedish and Polish yes/no options in config files * support binding F11 and F12 keys * TOOLS/divx2svcd updated * stricter thread code in Win32 loader (works under NetBSD) * PJS subtitle support (was: dunnowhat) * TOOLS/avifix: simple tool to fix chunk sizes in AVI files * proper extraheader handling when libavcodec is used in MEncoder * AVI OpenDML read and write support * AVI VPRP (video property) read and write support * fixed long standing lame quality option off-by-one bug in MEncoder * MPL2 subtitle support * less verbosity in Win32 loader and other places @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2004/01/26 12:06:43 jmmv Exp $ d3 10 a12 12 --- loader/win32.c.orig 2003-09-06 00:08:23.000000000 +0200 +++ loader/win32.c 2004-01-24 15:39:14.000000000 +0100 @@@@ -1374,8 +1374,11 @@@@ printf("Win32 Warning: Leaving uninitialized Critical Section %p!!\n", c); return; } - cs->locked=0; - pthread_mutex_unlock(&(cs->mutex)); + if (cs->locked) + { + cs->locked=0; + pthread_mutex_unlock(&(cs->mutex)); a13 2 return; } d15 2 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.11 2004/01/24 15:00:26 tron Exp $ @ 1.1.1.1 log @Move mplayer-share to the multimedia category (coming from graphics). This is version 1.0rc3. @ text @@