head	1.2;
access;
symbols
	pkgsrc-2015Q3:1.1.0.12
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.10
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.8
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.6
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.4
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.2
	pkgsrc-2014Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2015.11.21.09.47.23;	author leot;	state dead;
branches;
next	1.1;
commitid	AsLuTCIkweHAuWJy;

1.1
date	2014.06.27.15.58.44;	author drochner;	state Exp;
branches;
next	;
commitid	esjd71tqQsd22bGx;


desc
@@


1.2
log
@Update gmplayer, mencoder, mplayer and mplayer-share to 1.2.

pkgsrc changes:
 * Various misc fixes (thanks to pkglint)
 * Do not pass --with-dvdread-config and --with-dvdnav-config, the
   dvdread-config and dvdnav-config seems that no longer exist.
 * Avoid to pass --enable-libvorbis otherwise libvorbis can not be recognised by
   the mplayer configure script.
 * (re)Use patches from multimedia/ffmpeg2 instead of using mplayer-specific
   ones

Changes:
1.2: "FrameCounter"
  Decoders:
  * Hardware accelerated decoding on OS X via VDA.
  * Internal libmpeg2 disabled by default, on the assumption
    that nobody really needs it anymore.

  Other:
  * "run" slave/keybinding command now supports expanding properties
  * better support for > 8 bit formats in -vo gl
  * support for XYZ color space in -vo gl
  * -vo gl now supports OSD (not EOSD though) with GLES backend.
  * GLES backend now uses GLES v2 with YUV support via shaders
  * -vo gl supports rotated display without needing video filters via
    -monitor-orientation command-line option.
  * -vo gl now has an OSX/Cocoa backend, so it should be a better
    alternative to -vo corevideo now.
  * -vo gl2 renamed to -vo gl_tiled to stop people from assuming it is
    better than -vo gl (it is in many ways worse).
  * Fixes for DVB, teletext and closed-caption based subtitles.
  * Support teletext and CC subtitles in WTV.
  * Support binding keys corresponding to non-ASCII characters.
  * Limited -endpos support for -dump*
  * Danish messages header file renamed from help_mp-dk.h to help_mp-da.h
    in order to comply with ISO 639 language code (configure language
    options will now require da instead of dk)
  * configure: options --enable-gtk1, --with-glib-config= and
    --with-gtk-config= removed
  * Change ID3 genre name for genre ID 67 from "Psychadelic"
    to "Psychedelic"
  * support for audio bin/cue images

  Ports:
  * Windows: support file names as UTF-8 in slave mode and passing
    file names as wchar command line arguments.
  * Android: MPlayer can be run from adb shell and display videos
    via OpenGL ES.
    Note that just a bit of seeking etc. would cause reproducible
    system reboots after just a few seconds on my Galaxy S2.
  * Android: -wid is supported. This should allow using MPlayer in slave
    mode, a native window pointer needs to be passed as -wid. Untested.

  GUI:
  * Support for TV/DVB
  * Various improvements of the context menu and the preferences dialog
  * Revision of the user interface texts
  * Console message with information on deprecated (but still supported)
    entries in the skin configuration file
  * New symbol character (r) and new dynamic label variables ($D, $U, $P)
  * New items (pimage, rpotmeter)
  * Updated skins (avifile, Blue, Blue-small, Clearlooks, Corelian,
    disappearer, mentalic, mplayer_red, nativeRed, neutron, phony, plastic,
    slim, softgrip, standard, trium, tvisor, xanim)
  * Video can be rotated
  * New GUI message: evSetRotation
  * GUI now officially needs GTK+ and GLib versions 2 (it hadn't compiled
    with versions 1 for quite some time)
  * Support for audio and video bin/cue image playback
  * Support for Audio CD / (Super) Video CD / DVD image and DVD copy playback
    through the respective scheme (cd://, vcd://, dvd://)
  * Support for arbitrary non-binary data file cue sheets (i.e. cue sheets
    describing playlists for data files containing multiple titles)

  FFmpeg:
  * Version 2.8 with local patches

Thanks to wiz@@ for misc private discussion.
@
text
@$NetBSD: patch-CVE-2014-4610,v 1.1 2014/06/27 15:58:44 drochner Exp $

from ffmpeg 1.2.6->1.2.7

--- ffmpeg/libavutil/lzo.c.orig	2014-06-27 15:38:28.000000000 +0000
+++ ffmpeg/libavutil/lzo.c
@@@@ -20,6 +20,7 @@@@
  */
 
 #include "avutil.h"
+#include "avassert.h"
 #include "common.h"
 /// Avoid e.g. MPlayers fast_memcpy, it slows things down here.
 #undef memcpy
@@@@ -62,7 +63,13 @@@@ static inline int get_byte(LZOContext *c
 static inline int get_len(LZOContext *c, int x, int mask) {
     int cnt = x & mask;
     if (!cnt) {
-        while (!(x = get_byte(c))) cnt += 255;
+        while (!(x = get_byte(c))) {
+	    if (cnt >= INT_MAX - 1000) {
+		c->error |= AV_LZO_ERROR;
+		break;
+	    }
+	    cnt += 255;
+	}
         cnt += mask + x;
     }
     return cnt;
@@@@ -88,6 +95,7 @@@@ static inline int get_len(LZOContext *c,
 static inline void copy(LZOContext *c, int cnt) {
     register const uint8_t *src = c->in;
     register uint8_t *dst = c->out;
+    av_assert0(cnt >= 0);
     if (cnt > c->in_end - src) {
         cnt = FFMAX(c->in_end - src, 0);
         c->error |= AV_LZO_INPUT_DEPLETED;
@@@@ -119,9 +127,9 @@@@ static inline void memcpy_backptr(uint8_
  * thus creating a repeating pattern with a period length of back.
  */
 static inline void copy_backptr(LZOContext *c, int back, int cnt) {
-    register const uint8_t *src = &c->out[-back];
     register uint8_t *dst = c->out;
-    if (src < c->out_start || src > dst) {
+    av_assert0(cnt > 0);
+    if (dst - c->out_start < back) {
         c->error |= AV_LZO_INVALID_BACKPTR;
         return;
     }
@


1.1
log
@add patch from ffmpeg to fix the recent LZO integer overflow
bump PKGREV
@
text
@d1 1
a1 1
$NetBSD$
@