Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2bc1a6b144c36c4128534f961e4ebc41996f1ce0
commit 2bc1a6b144c36c4128534f961e4ebc41996f1ce0 Author: kikadf <[email protected]> Date: Tue Nov 27 17:03:02 2012 +0100 mplayer2-20121127.gf046e99-1-x86_64 * Version bump diff --git a/source/apps-extra/mplayer2/FrugalBuild b/source/apps-extra/mplayer2/FrugalBuild index 3e84f29..4c6bcc0 100644 --- a/source/apps-extra/mplayer2/FrugalBuild +++ b/source/apps-extra/mplayer2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: kikadf <[email protected]> pkgname=mplayer2 -pkgver=20121108.gb5349bb +pkgver=20121127.gf046e99 pkgrel=1 pkgdesc="Mplayer2 is an advanced general-purpose video player. A fork of the original MPlayer project." url="http://www.mplayer2.org/"; diff --git a/source/apps-extra/mplayer2/f5e0365c8e76e2ef797027134f1819e613764d7e.patch b/source/apps-extra/mplayer2/f5e0365c8e76e2ef797027134f1819e613764d7e.patch deleted file mode 100644 index a501613..0000000 --- a/source/apps-extra/mplayer2/f5e0365c8e76e2ef797027134f1819e613764d7e.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f5e0365c8e76e2ef797027134f1819e613764d7e Mon Sep 17 00:00:00 2001 -From: Anton Khirnov <[email protected]> -Date: Wed, 19 Sep 2012 12:00:01 +0000 -Subject: vf_lavc: fix compilation with latest libav - -Remove a pointless and broken check for avctx->codec->encode. - -1) The check does not test for anything useful. -2) AVCodecContext.encode is a private field and is not supposed to be - accessed from outside of lavc. -2a) AVCodecContext.encode does not exist anymore in latest libavcodec, - so this block fails to build. ---- -diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c -index b2c1dd7..65e93a1 100644 ---- a/libmpcodecs/vf_lavc.c -+++ b/libmpcodecs/vf_lavc.c -@@ -76,11 +76,6 @@ static int config(struct vf_instance *vf, - return 0; - } - -- if (lavc_venc_context.codec->encode == NULL) { -- mp_msg(MSGT_VFILTER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n"); -- return 0; -- } -- - return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES); - } - --- -cgit v0.9 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
