Author: pebender
Date: Tue Jun 30 16:56:05 2009
New Revision: 5086
Modified:
trunk/gar-minimyth/html/minimyth/index.html
trunk/gar-minimyth/script/lib/ffmpeg/Makefile
trunk/gar-minimyth/script/lib/ffmpeg/checksums
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-h264_vaapi_take_19.patch
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20090616.patch
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk
Log:
- Updated packages lib/ffmpeg mediaplayers/mplayer-svn.
Modified: trunk/gar-minimyth/html/minimyth/index.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/index.html (original)
+++ trunk/gar-minimyth/html/minimyth/index.html Tue Jun 30 16:56:05 2009
@@ -58,8 +58,8 @@
</li>
<li><a
href="http://home.kabelfoon.nl/~moongies/streamtuned.html";>MythStream</a>
<strong>0.18_1</strong></li>
<li>
- <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN
29374</strong> and
- <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN
19228</strong>
+ <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN
29408</strong> and
+ <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN
19309</strong>
</li>
<li>
<a href="http://www.mplayerhq.hu/";>MPlayer</a>
<strong>1.0rc2</strong> with patches to add
@@ -70,12 +70,12 @@
</li>
<li>
<a href="http://www.videolan.org/";>VLC</a>
<strong>1.0.0-rc4</strong> and
- <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN
19228</strong>
+ <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN
19309</strong>
</li>
<li>
<a href="http://www.xine-project.org/";>xine-ui</a>
<strong>0.99.5</strong>,
<a href="http://www.xine-project.org/";>xine-lib</a>
<strong>1.1.16.3</strong> and
- <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN
19228</strong>
+ <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN
19309</strong>
</li>
<li>
<a href="http://fceultra.sourceforge.net/";>FCE Ultra</a>
<strong>0.98.13-pre</strong>
Modified: trunk/gar-minimyth/script/lib/ffmpeg/Makefile
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/Makefile (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/Makefile Tue Jun 30 16:56:05 2009
@@ -1,5 +1,5 @@
GARNAME = ffmpeg
-GARVERSION = 19228.$(MPLAYER_TRUNK_VERSION)
+GARVERSION = 19309.$(MPLAYER_TRUNK_VERSION)
CATEGORIES = lib
MASTER_SITES = svn://svn.ffmpeg.org/
DISTFILES = $(DISTNAME).tar.bz2
Modified: trunk/gar-minimyth/script/lib/ffmpeg/checksums
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/checksums (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/checksums Tue Jun 30 16:56:05 2009
@@ -1,2 +1,2 @@
-1a0774e392c05307a54bf15bcf3c88ef download/ffmpeg-h264_vaapi_take_19.patch
-aa5b869686f75dab01eacb45653aa1c4 download/ffmpeg.patch.gar
+2b9694ace0ea1319168827705e1f804e download/ffmpeg-h264_vaapi_take_19.patch
+dbacb9c568f6d15099d65aba56fceff7 download/ffmpeg.patch.gar
Modified:
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-h264_vaapi_take_19.patch
==============================================================================
---
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-h264_vaapi_take_19.patch
(original)
+++
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-h264_vaapi_take_19.patch
Tue Jun 30 16:56:05 2009
@@ -1,6 +1,6 @@
-diff -Naur ffmpeg-19228.29374-old/libavcodec/allcodecs.c
ffmpeg-19228.29374-new/libavcodec/allcodecs.c
---- ffmpeg-19228.29374-old/libavcodec/allcodecs.c 2009-06-19
17:11:23.000000000 -0700
-+++ ffmpeg-19228.29374-new/libavcodec/allcodecs.c 2009-06-22
09:12:33.000000000 -0700
+diff -Naur ffmpeg-19309.29408-old/libavcodec/allcodecs.c
ffmpeg-19309.29408-new/libavcodec/allcodecs.c
+--- ffmpeg-19309.29408-old/libavcodec/allcodecs.c 2009-06-30
16:29:02.000000000 -0700
++++ ffmpeg-19309.29408-new/libavcodec/allcodecs.c 2009-06-30
16:29:28.000000000 -0700
@@ -55,6 +55,7 @@
/* hardware accelerators */
@@ -9,9 +9,9 @@
REGISTER_HWACCEL (MPEG2_VAAPI, mpeg2_vaapi);
REGISTER_HWACCEL (MPEG4_VAAPI, mpeg4_vaapi);
REGISTER_HWACCEL (VC1_VAAPI, vc1_vaapi);
-diff -Naur ffmpeg-19228.29374-old/libavcodec/Makefile
ffmpeg-19228.29374-new/libavcodec/Makefile
---- ffmpeg-19228.29374-old/libavcodec/Makefile 2009-06-19
17:11:23.000000000 -0700
-+++ ffmpeg-19228.29374-new/libavcodec/Makefile 2009-06-22
09:13:28.000000000 -0700
+diff -Naur ffmpeg-19309.29408-old/libavcodec/Makefile
ffmpeg-19309.29408-new/libavcodec/Makefile
+--- ffmpeg-19309.29408-old/libavcodec/Makefile 2009-06-30
16:29:02.000000000 -0700
++++ ffmpeg-19309.29408-new/libavcodec/Makefile 2009-06-30
16:29:28.000000000 -0700
@@ -108,6 +108,7 @@
OBJS-$(CONFIG_H263P_ENCODER) += mpegvideo_enc.o motion_est.o
ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o
h264_parser.o cabac.o mpegvideo.o error_resilience.o
@@ -20,9 +20,9 @@
OBJS-$(CONFIG_H264_VDPAU_DECODER) += h264.o h264idct.o h264pred.o
h264_parser.o cabac.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
-diff -Naur ffmpeg-19228.29374-old/libavcodec/vaapi_h264.c
ffmpeg-19228.29374-new/libavcodec/vaapi_h264.c
---- ffmpeg-19228.29374-old/libavcodec/vaapi_h264.c 1969-12-31
16:00:00.000000000 -0800
-+++ ffmpeg-19228.29374-new/libavcodec/vaapi_h264.c 2009-06-22
09:12:33.000000000 -0700
+diff -Naur ffmpeg-19309.29408-old/libavcodec/vaapi_h264.c
ffmpeg-19309.29408-new/libavcodec/vaapi_h264.c
+--- ffmpeg-19309.29408-old/libavcodec/vaapi_h264.c 1969-12-31
16:00:00.000000000 -0800
++++ ffmpeg-19309.29408-new/libavcodec/vaapi_h264.c 2009-06-30
16:29:28.000000000 -0700
@@ -0,0 +1,360 @@
+/*
+ * H.264 HW decode acceleration through VAAPI
Modified: trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar Tue Jun 30
16:56:05 2009
@@ -1,7 +1,7 @@
-diff -Naur ffmpeg-19228.29374-old/configure
ffmpeg-19228.29374-new/configure
---- ffmpeg-19228.29374-old/configure 2009-06-19 17:11:30.000000000 -0700
-+++ ffmpeg-19228.29374-new/configure 2009-06-19 21:02:11.000000000 -0700
-@@ -740,11 +740,11 @@
+diff -Naur ffmpeg-19309.29408-old/configure
ffmpeg-19309.29408-new/configure
+--- ffmpeg-19309.29408-old/configure 2009-06-30 16:29:28.000000000 -0700
++++ ffmpeg-19309.29408-new/configure 2009-06-30 16:29:28.000000000 -0700
+@@ -742,11 +742,11 @@
func=$4
shift 4
disable $cfg
@@ -16,7 +16,7 @@
check_lib "$@" $header $func && enable $cfg
fi
return $err
-@@ -2135,7 +2135,7 @@
+@@ -2143,7 +2143,7 @@
disable sdl_too_old
disable sdl
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
(original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums Tue Jun
30
16:56:05 2009
@@ -1,2 +1,2 @@
-4238ea4bd0a9cdee7d66f1a57f714184 download/MPlayer-gcc_4.4.0_hack.patch
-f87a2ee75a6285b92089cd3ad47fdb29 download/MPlayer-vaapi_20090616.patch
+2178ce25aec6dd504e51b1172125731b download/MPlayer-gcc_4.4.0_hack.patch
+b646f85a9e322c20532b6045b2410cf0 download/MPlayer-vaapi_20090616.patch
Modified:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch
==============================================================================
---
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch
(original)
+++
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch
Tue Jun 30 16:56:05 2009
@@ -1,6 +1,6 @@
-diff -Naur MPlayer-29374-old/configure MPlayer-29374-new/configure
---- MPlayer-29374-old/configure 2009-06-19 21:04:12.000000000 -0700
-+++ MPlayer-29374-new/configure 2009-06-19 21:06:05.000000000 -0700
+diff -Naur MPlayer-29408-old/configure MPlayer-29408-new/configure
+--- MPlayer-29408-old/configure 2009-06-30 16:31:10.000000000 -0700
++++ MPlayer-29408-new/configure 2009-06-30 16:32:37.000000000 -0700
@@ -2410,8 +2410,8 @@
__attribute__((noinline)) static int foo3(int i1, int i2, int i3) {
return i3; }
int main(void) { return foo3(1,2,3) == 3 ? 0 : 1; }
@@ -21,7 +21,7 @@
extra_ldflags="$extra_ldflags -ffast-math"
fi
else
-@@ -6554,7 +6554,7 @@
+@@ -6557,7 +6557,7 @@
EOF
_faac=no
for _ld_faac in "-lfaac" "-lfaac -lmp4v2 -lstdc++" ; do
Modified:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20090616.patch
==============================================================================
---
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20090616.patch
(original)
+++
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20090616.patch
Tue Jun 30 16:56:05 2009
@@ -1,6 +1,6 @@
-diff -Naur MPlayer-29374-old/cfg-common-opts.h
MPlayer-29374-new/cfg-common-opts.h
---- MPlayer-29374-old/cfg-common-opts.h 2009-06-19 21:04:12.000000000
-0700
-+++ MPlayer-29374-new/cfg-common-opts.h 2009-06-26 05:19:46.000000000
-0700
+diff -Naur MPlayer-29408-old/cfg-common-opts.h
MPlayer-29408-new/cfg-common-opts.h
+--- MPlayer-29408-old/cfg-common-opts.h 2009-06-30 16:32:37.000000000
-0700
++++ MPlayer-29408-new/cfg-common-opts.h 2009-06-30 16:32:37.000000000
-0700
@@ -227,6 +227,7 @@
// {"ac", &audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"ac", &audio_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
@@ -9,9 +9,9 @@
// postprocessing:
#ifdef CONFIG_LIBAVCODEC
-diff -Naur MPlayer-29374-old/codec-cfg.c MPlayer-29374-new/codec-cfg.c
---- MPlayer-29374-old/codec-cfg.c 2009-06-19 21:04:12.000000000 -0700
-+++ MPlayer-29374-new/codec-cfg.c 2009-06-26 05:19:46.000000000 -0700
+diff -Naur MPlayer-29408-old/codec-cfg.c MPlayer-29408-new/codec-cfg.c
+--- MPlayer-29408-old/codec-cfg.c 2009-06-30 16:32:37.000000000 -0700
++++ MPlayer-29408-new/codec-cfg.c 2009-06-30 16:32:37.000000000 -0700
@@ -182,6 +182,13 @@
{"IDCT_MPEG2",IMGFMT_XVMC_IDCT_MPEG2},
{"MOCO_MPEG2",IMGFMT_XVMC_MOCO_MPEG2},
@@ -26,9 +26,9 @@
{"VDPAU_MPEG1",IMGFMT_VDPAU_MPEG1},
{"VDPAU_MPEG2",IMGFMT_VDPAU_MPEG2},
{"VDPAU_H264",IMGFMT_VDPAU_H264},
-diff -Naur MPlayer-29374-old/configure MPlayer-29374-new/configure
---- MPlayer-29374-old/configure 2009-06-19 21:04:12.000000000 -0700
-+++ MPlayer-29374-new/configure 2009-06-26 05:19:46.000000000 -0700
+diff -Naur MPlayer-29408-old/configure MPlayer-29408-new/configure
+--- MPlayer-29408-old/configure 2009-06-30 16:32:37.000000000 -0700
++++ MPlayer-29408-new/configure 2009-06-30 16:32:37.000000000 -0700
@@ -354,6 +354,9 @@
--disable-muxer=MUXER disable specified FFmpeg muxer
--enable-muxer=MUXER enable specified FFmpeg muxer
@@ -113,7 +113,7 @@
fi
echores "$_vdpau"
-@@ -8316,6 +8347,7 @@
+@@ -8319,6 +8350,7 @@
TWOLAME=$_twolame
UNRAR_EXEC = $_unrar_exec
V4L2 = $_v4l2
@@ -121,7 +121,7 @@
VCD = $_vcd
VDPAU = $_vdpau
VESA = $_vesa
-@@ -8405,6 +8437,7 @@
+@@ -8408,6 +8440,7 @@
CONFIG_POSTPROC = yes
# Prevent building libavcodec/imgresample.c with conflicting symbols
CONFIG_SWSCALE=yes
@@ -129,7 +129,7 @@
CONFIG_VDPAU=$_vdpau
CONFIG_XVMC=$_xvmc
CONFIG_ZLIB=$_zlib
-@@ -8413,6 +8446,7 @@
+@@ -8416,6 +8449,7 @@
HAVE_W32THREADS = $_w32threads
HAVE_YASM = $_have_yasm
@@ -137,7 +137,7 @@
$(echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' |
sed 's/^/CONFIG_/;s/$/=yes/')
$(echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' |
sed 's/^/CONFIG_/;s/$/=yes/')
$(echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' |
sed 's/^/CONFIG_/;s/$/=yes/')
-@@ -8770,6 +8804,7 @@
+@@ -8773,6 +8807,7 @@
$def_tdfxvid
$def_tga
$def_v4l2
@@ -145,7 +145,7 @@
$def_vdpau
$def_vesa
$def_vidix
-@@ -8887,6 +8922,7 @@
+@@ -8890,6 +8925,7 @@
$def_x264_lavc
$def_xvid_lavc
@@ -153,7 +153,7 @@
$(ff_config_enable "$_libavdecoders_all" "$_libavdecoders")
$(ff_config_enable "$_libavencoders_all" "$_libavencoders")
$(ff_config_enable "$_libavparsers_all" "$_libavparsers")
-@@ -8895,13 +8931,6 @@
+@@ -8898,13 +8934,6 @@
$(ff_config_enable "$_libavprotocols_all" "$_libavprotocols")
$(ff_config_enable "$_libavbsfs_all" "$_libavbsfs")
@@ -167,9 +167,9 @@
#endif /* MPLAYER_CONFIG_H */
EOF
-diff -Naur MPlayer-29374-old/etc/codecs.conf
MPlayer-29374-new/etc/codecs.conf
---- MPlayer-29374-old/etc/codecs.conf 2009-06-19 21:04:11.000000000 -0700
-+++ MPlayer-29374-new/etc/codecs.conf 2009-06-26 05:19:46.000000000 -0700
+diff -Naur MPlayer-29408-old/etc/codecs.conf
MPlayer-29408-new/etc/codecs.conf
+--- MPlayer-29408-old/etc/codecs.conf 2009-06-30 16:32:37.000000000 -0700
++++ MPlayer-29408-new/etc/codecs.conf 2009-06-30 16:32:37.000000000 -0700
@@ -164,6 +164,7 @@
fourcc LMP2 ; Lead mpeg2 in avi
driver ffmpeg
@@ -178,7 +178,7 @@
out YV12,I420,IYUV
out 422P,444P
-@@ -824,6 +825,7 @@
+@@ -831,6 +832,7 @@
fourcc WMV3,wmv3
driver ffmpeg
dll wmv3
@@ -186,7 +186,7 @@
out YV12,I420,IYUV
videocodec ffwmv3vdpau
-@@ -841,6 +843,7 @@
+@@ -848,6 +850,7 @@
fourcc vc-1,VC-1
driver ffmpeg
dll vc1
@@ -194,7 +194,7 @@
out YV12,I420,IYUV
videocodec ffvc1vdpau
-@@ -862,6 +865,7 @@
+@@ -870,6 +873,7 @@
format 0x10000005
driver ffmpeg
dll h264
@@ -202,7 +202,7 @@
out YV12,I420,IYUV
videocodec ffh264vdpau
-@@ -913,6 +917,7 @@
+@@ -922,6 +926,7 @@
fourcc EPHV,SN40
driver ffmpeg
dll mpeg4 ;opendivx
@@ -210,7 +210,7 @@
out YV12,I420,IYUV
videocodec ffwv1f
-@@ -1412,6 +1417,7 @@
+@@ -1421,6 +1426,7 @@
fourcc VX1K ; Agora Labs VX1000S H263
driver ffmpeg
dll h263
@@ -218,9 +218,9 @@
out YV12,I420,IYUV
videocodec ffzygo
-diff -Naur MPlayer-29374-old/fmt-conversion.c
MPlayer-29374-new/fmt-conversion.c
---- MPlayer-29374-old/fmt-conversion.c 2009-06-19 21:04:12.000000000 -0700
-+++ MPlayer-29374-new/fmt-conversion.c 2009-06-26 05:19:46.000000000 -0700
+diff -Naur MPlayer-29408-old/fmt-conversion.c
MPlayer-29408-new/fmt-conversion.c
+--- MPlayer-29408-old/fmt-conversion.c 2009-06-30 16:32:37.000000000 -0700
++++ MPlayer-29408-new/fmt-conversion.c 2009-06-30 16:32:37.000000000 -0700
@@ -18,12 +18,14 @@
#include "mp_msg.h"
@@ -271,9 +271,9 @@
break;
fmt = conversion_map[i].fmt;
if (!fmt)
-diff -Naur MPlayer-29374-old/fmt-conversion.h
MPlayer-29374-new/fmt-conversion.h
---- MPlayer-29374-old/fmt-conversion.h 2009-06-19 21:04:12.000000000 -0700
-+++ MPlayer-29374-new/fmt-conversion.h 2009-06-26 05:19:46.000000000 -0700
+diff -Naur MPlayer-29408-old/fmt-conversion.h
MPlayer-29408-new/fmt-conversion.h
+--- MPlayer-29408-old/fmt-conversion.h 2009-06-30 16:32:37.000000000 -0700
++++ MPlayer-29408-new/fmt-conversion.h 2009-06-30 16:32:37.000000000 -0700
@@ -4,6 +4,6 @@
#include "libavutil/avutil.h"
@@ -282,9 +282,9 @@
+int pixfmt2imgfmt(enum PixelFormat pix_fmt, int codec_id);
#endif /* MPLAYER_FMT_CONVERSION_H */
-diff -Naur MPlayer-29374-old/gui/mplayer/gtk/opts.c
MPlayer-29374-new/gui/mplayer/gtk/opts.c
---- MPlayer-29374-old/gui/mplayer/gtk/opts.c 2009-06-19 21:03:43.000000000
-0700
-+++ MPlayer-29374-new/gui/mplayer/gtk/opts.c 2009-06-26 05:19:46.000000000
-0700
+diff -Naur MPlayer-29408-old/gui/mplayer/gtk/opts.c
MPlayer-29408-new/gui/mplayer/gtk/opts.c
+--- MPlayer-29408-old/gui/mplayer/gtk/opts.c 2009-06-30 16:32:37.000000000
-0700
++++ MPlayer-29408-new/gui/mplayer/gtk/opts.c 2009-06-30 16:32:37.000000000
-0700
@@ -63,9 +63,11 @@
GtkWidget * prEFontName;
GtkWidget * prEDVDDevice;
@@ -363,9 +363,9 @@
AddLabel( MSGTR_PREFERENCES_VideoCodecFamily,hbox5 );
CBVFM=gtk_combo_new();
-diff -Naur MPlayer-29374-old/help/help_mp-en.h
MPlayer-29374-new/help/help_mp-en.h
---- MPlayer-29374-old/help/help_mp-en.h 2009-06-19 21:04:06.000000000
-0700
-+++ MPlayer-29374-new/help/help_mp-en.h 2009-06-26 05:19:46.000000000
-0700
+diff -Naur MPlayer-29408-old/help/help_mp-en.h
MPlayer-29408-new/help/help_mp-en.h
+--- MPlayer-29408-old/help/help_mp-en.h 2009-06-30 16:32:37.000000000
-0700
++++ MPlayer-29408-new/help/help_mp-en.h 2009-06-30 16:32:37.000000000
-0700
@@ -718,6 +718,7 @@
#define MSGTR_PREFERENCES_IDX "Rebuild index table, if needed"
#define MSGTR_PREFERENCES_VideoCodecFamily "Video codec family:"
@@ -382,9 +382,9 @@
// libmpcodecs/ve_lavc.c
#define MSGTR_MPCODECS_HighQualityEncodingSelected "[VE_LAVC] High
quality encoding selected (non-realtime)!\n"
-diff -Naur MPlayer-29374-old/libmpcodecs/dec_video.c
MPlayer-29374-new/libmpcodecs/dec_video.c
---- MPlayer-29374-old/libmpcodecs/dec_video.c 2009-06-19
21:03:33.000000000 -0700
-+++ MPlayer-29374-new/libmpcodecs/dec_video.c 2009-06-26
05:20:13.000000000 -0700
+diff -Naur MPlayer-29408-old/libmpcodecs/dec_video.c
MPlayer-29408-new/libmpcodecs/dec_video.c
+--- MPlayer-29408-old/libmpcodecs/dec_video.c 2009-06-30
16:32:37.000000000 -0700
++++ MPlayer-29408-new/libmpcodecs/dec_video.c 2009-06-30
16:32:37.000000000 -0700
@@ -39,9 +39,47 @@
int field_dominance=-1;
@@ -433,9 +433,9 @@
int get_video_quality_max(sh_video_t *sh_video){
vf_instance_t* vf=sh_video->vfilter;
if(vf){
-diff -Naur MPlayer-29374-old/libmpcodecs/dec_video.h
MPlayer-29374-new/libmpcodecs/dec_video.h
---- MPlayer-29374-old/libmpcodecs/dec_video.h 2009-06-19
21:03:33.000000000 -0700
-+++ MPlayer-29374-new/libmpcodecs/dec_video.h 2009-06-26
05:20:14.000000000 -0700
+diff -Naur MPlayer-29408-old/libmpcodecs/dec_video.h
MPlayer-29408-new/libmpcodecs/dec_video.h
+--- MPlayer-29408-old/libmpcodecs/dec_video.h 2009-06-30
16:32:37.000000000 -0700
++++ MPlayer-29408-new/libmpcodecs/dec_video.h 2009-06-30
16:32:37.000000000 -0700
@@ -3,6 +3,14 @@
#include "libmpdemux/stheader.h"
@@ -463,9 +463,9 @@
+extern char *video_hwaccel_name;
#endif /* MPLAYER_DEC_VIDEO_H */
-diff -Naur MPlayer-29374-old/libmpcodecs/img_format.c
MPlayer-29374-new/libmpcodecs/img_format.c
---- MPlayer-29374-old/libmpcodecs/img_format.c 2009-06-19
21:03:33.000000000 -0700
-+++ MPlayer-29374-new/libmpcodecs/img_format.c 2009-06-26
05:20:14.000000000 -0700
+diff -Naur MPlayer-29408-old/libmpcodecs/img_format.c
MPlayer-29408-new/libmpcodecs/img_format.c
+--- MPlayer-29408-old/libmpcodecs/img_format.c 2009-06-30
16:32:37.000000000 -0700
++++ MPlayer-29408-new/libmpcodecs/img_format.c 2009-06-30
16:32:37.000000000 -0700
@@ -67,6 +67,14 @@
case IMGFMT_ZRMJPEGIB: return "Zoran MJPEG bottom field first";
case IMGFMT_XVMC_MOCO_MPEG2: return "MPEG1/2 Motion Compensation";
@@ -481,9 +481,9 @@
case IMGFMT_VDPAU_MPEG1: return "MPEG1 VDPAU acceleration";
case IMGFMT_VDPAU_MPEG2: return "MPEG2 VDPAU acceleration";
case IMGFMT_VDPAU_H264: return "H.264 VDPAU acceleration";
-diff -Naur MPlayer-29374-old/libmpcodecs/img_format.h
MPlayer-29374-new/libmpcodecs/img_format.h
---- MPlayer-29374-old/libmpcodecs/img_format.h 2009-06-19
21:03:33.000000000 -0700
-+++ MPlayer-29374-new/libmpcodecs/img_format.h 2009-06-26
05:20:14.000000000 -0700
+diff -Naur MPlayer-29408-old/libmpcodecs/img_format.h
MPlayer-29408-new/libmpcodecs/img_format.h
+--- MPlayer-29408-old/libmpcodecs/img_format.h 2009-06-30
16:32:37.000000000 -0700
++++ MPlayer-29408-new/libmpcodecs/img_format.h 2009-06-30
16:32:37.000000000 -0700
@@ -107,6 +107,26 @@
#define IMGFMT_XVMC_MOCO_MPEG2 (IMGFMT_XVMC|0x02)
#define IMGFMT_XVMC_IDCT_MPEG2 (IMGFMT_XVMC|0x82)
@@ -511,9 +511,9 @@
// VDPAU specific format.
#define IMGFMT_VDPAU 0x1DC80000
#define IMGFMT_VDPAU_MASK 0xFFFF0000
-diff -Naur MPlayer-29374-old/libmpcodecs/mp_image.h
MPlayer-29374-new/libmpcodecs/mp_image.h
---- MPlayer-29374-old/libmpcodecs/mp_image.h 2009-06-19 21:03:33.000000000
-0700
-+++ MPlayer-29374-new/libmpcodecs/mp_image.h 2009-06-26 05:20:14.000000000
-0700
+diff -Naur MPlayer-29408-old/libmpcodecs/mp_image.h
MPlayer-29408-new/libmpcodecs/mp_image.h
+--- MPlayer-29408-old/libmpcodecs/mp_image.h 2009-06-30 16:32:37.000000000
-0700
++++ MPlayer-29408-new/libmpcodecs/mp_image.h 2009-06-30 16:32:37.000000000
-0700
@@ -111,6 +111,7 @@
// compressed formats
if(out_fmt == IMGFMT_MPEGPES ||
@@ -522,9 +522,9 @@
IMGFMT_IS_VDPAU(out_fmt) || IMGFMT_IS_XVMC(out_fmt)){
mpi->bpp=0;
return;
-diff -Naur MPlayer-29374-old/libmpcodecs/vd.c
MPlayer-29374-new/libmpcodecs/vd.c
---- MPlayer-29374-old/libmpcodecs/vd.c 2009-06-19 21:03:33.000000000 -0700
-+++ MPlayer-29374-new/libmpcodecs/vd.c 2009-06-26 05:20:14.000000000 -0700
+diff -Naur MPlayer-29408-old/libmpcodecs/vd.c
MPlayer-29408-new/libmpcodecs/vd.c
+--- MPlayer-29408-old/libmpcodecs/vd.c 2009-06-30 16:32:37.000000000 -0700
++++ MPlayer-29408-new/libmpcodecs/vd.c 2009-06-30 16:32:37.000000000 -0700
@@ -345,3 +345,12 @@
if(vf->draw_slice)
vf->draw_slice(vf,src,stride,w,h,x,y);
@@ -538,9 +538,9 @@
+ return ctx;
+ return NULL;
+}
-diff -Naur MPlayer-29374-old/libmpcodecs/vd_ffmpeg.c
MPlayer-29374-new/libmpcodecs/vd_ffmpeg.c
---- MPlayer-29374-old/libmpcodecs/vd_ffmpeg.c 2009-06-19
21:03:33.000000000 -0700
-+++ MPlayer-29374-new/libmpcodecs/vd_ffmpeg.c 2009-06-26
05:20:14.000000000 -0700
+diff -Naur MPlayer-29408-old/libmpcodecs/vd_ffmpeg.c
MPlayer-29408-new/libmpcodecs/vd_ffmpeg.c
+--- MPlayer-29408-old/libmpcodecs/vd_ffmpeg.c 2009-06-30
16:32:37.000000000 -0700
++++ MPlayer-29408-new/libmpcodecs/vd_ffmpeg.c 2009-06-30
16:32:37.000000000 -0700
@@ -14,6 +14,7 @@
#include "fmt-conversion.h"
@@ -720,9 +720,9 @@
}
-#endif /* CONFIG_XVMC || CONFIG_VDPAU */
+#endif /* CONFIG_XVMC || CONFIG_VAAPI || CONFIG_VDPAU */
-diff -Naur MPlayer-29374-old/libmpcodecs/vd.h
MPlayer-29374-new/libmpcodecs/vd.h
---- MPlayer-29374-old/libmpcodecs/vd.h 2009-06-19 21:03:33.000000000 -0700
-+++ MPlayer-29374-new/libmpcodecs/vd.h 2009-06-26 05:20:14.000000000 -0700
+diff -Naur MPlayer-29408-old/libmpcodecs/vd.h
MPlayer-29408-new/libmpcodecs/vd.h
+--- MPlayer-29408-old/libmpcodecs/vd.h 2009-06-30 16:32:37.000000000 -0700
++++ MPlayer-29408-new/libmpcodecs/vd.h 2009-06-30 16:32:37.000000000 -0700
@@ -34,6 +34,7 @@
int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int
preferred_outfmt);
mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int
mp_imgflag, int w, int h);
@@ -731,9 +731,9 @@
#define VDFLAGS_DROPFRAME 3
-diff -Naur MPlayer-29374-old/libmpcodecs/vf.h
MPlayer-29374-new/libmpcodecs/vf.h
---- MPlayer-29374-old/libmpcodecs/vf.h 2009-06-19 21:03:33.000000000 -0700
-+++ MPlayer-29374-new/libmpcodecs/vf.h 2009-06-26 05:20:14.000000000 -0700
+diff -Naur MPlayer-29408-old/libmpcodecs/vf.h
MPlayer-29408-new/libmpcodecs/vf.h
+--- MPlayer-29408-old/libmpcodecs/vf.h 2009-06-30 16:32:37.000000000 -0700
++++ MPlayer-29408-new/libmpcodecs/vf.h 2009-06-30 16:32:37.000000000 -0700
@@ -89,6 +89,7 @@
#define VFCTRL_GET_PTS 17 /* Return last pts value that reached
vf_vo*/
#define VFCTRL_SET_DEINTERLACE 18 /* Set deinterlacing status */
@@ -742,9 +742,9 @@
#include "vfcap.h"
-diff -Naur MPlayer-29374-old/libmpcodecs/vf_vo.c
MPlayer-29374-new/libmpcodecs/vf_vo.c
---- MPlayer-29374-old/libmpcodecs/vf_vo.c 2009-06-19 21:03:33.000000000
-0700
-+++ MPlayer-29374-new/libmpcodecs/vf_vo.c 2009-06-26 05:20:14.000000000
-0700
+diff -Naur MPlayer-29408-old/libmpcodecs/vf_vo.c
MPlayer-29408-new/libmpcodecs/vf_vo.c
+--- MPlayer-29408-old/libmpcodecs/vf_vo.c 2009-06-30 16:32:37.000000000
-0700
++++ MPlayer-29408-new/libmpcodecs/vf_vo.c 2009-06-30 16:32:37.000000000
-0700
@@ -151,6 +151,12 @@
*(double *)data = vf->priv->pts;
return CONTROL_TRUE;
@@ -766,9 +766,9 @@
IMGFMT_IS_XVMC(mpi->imgfmt) || IMGFMT_IS_VDPAU(mpi->imgfmt))
video_out->control(VOCTRL_GET_IMAGE,mpi);
}
-diff -Naur MPlayer-29374-old/libvo/video_out.c
MPlayer-29374-new/libvo/video_out.c
---- MPlayer-29374-old/libvo/video_out.c 2009-06-19 21:03:47.000000000
-0700
-+++ MPlayer-29374-new/libvo/video_out.c 2009-06-26 05:20:14.000000000
-0700
+diff -Naur MPlayer-29408-old/libvo/video_out.c
MPlayer-29408-new/libvo/video_out.c
+--- MPlayer-29408-old/libvo/video_out.c 2009-06-30 16:32:37.000000000
-0700
++++ MPlayer-29408-new/libvo/video_out.c 2009-06-30 16:32:37.000000000
-0700
@@ -132,6 +132,7 @@
extern vo_functions_t video_out_quartz;
extern vo_functions_t video_out_pnm;
@@ -787,9 +787,9 @@
NULL
};
-diff -Naur MPlayer-29374-old/libvo/video_out.h
MPlayer-29374-new/libvo/video_out.h
---- MPlayer-29374-old/libvo/video_out.h 2009-06-19 21:03:47.000000000
-0700
-+++ MPlayer-29374-new/libvo/video_out.h 2009-06-26 05:20:14.000000000
-0700
+diff -Naur MPlayer-29408-old/libvo/video_out.h
MPlayer-29408-new/libvo/video_out.h
+--- MPlayer-29408-old/libvo/video_out.h 2009-06-30 16:32:37.000000000
-0700
++++ MPlayer-29408-new/libvo/video_out.h 2009-06-30 16:32:37.000000000
-0700
@@ -97,6 +97,10 @@
int w,h;
} mp_win_t;
@@ -801,9 +801,9 @@
#define VO_TRUE 1
#define VO_FALSE 0
#define VO_ERROR -1
-diff -Naur MPlayer-29374-old/libvo/vo_vaapi.c
MPlayer-29374-new/libvo/vo_vaapi.c
---- MPlayer-29374-old/libvo/vo_vaapi.c 1969-12-31 16:00:00.000000000 -0800
-+++ MPlayer-29374-new/libvo/vo_vaapi.c 2009-06-26 05:20:14.000000000 -0700
+diff -Naur MPlayer-29408-old/libvo/vo_vaapi.c
MPlayer-29408-new/libvo/vo_vaapi.c
+--- MPlayer-29408-old/libvo/vo_vaapi.c 1969-12-31 16:00:00.000000000 -0800
++++ MPlayer-29408-new/libvo/vo_vaapi.c 2009-06-30 16:32:37.000000000 -0700
@@ -0,0 +1,656 @@
+/*
+ * VA API output module
@@ -1461,9 +1461,9 @@
+ }
+ return VO_NOTIMPL;
+}
-diff -Naur MPlayer-29374-old/Makefile MPlayer-29374-new/Makefile
---- MPlayer-29374-old/Makefile 2009-06-19 21:04:12.000000000 -0700
-+++ MPlayer-29374-new/Makefile 2009-06-26 05:19:46.000000000 -0700
+diff -Naur MPlayer-29408-old/Makefile MPlayer-29408-new/Makefile
+--- MPlayer-29408-old/Makefile 2009-06-30 16:32:37.000000000 -0700
++++ MPlayer-29408-new/Makefile 2009-06-30 16:32:37.000000000 -0700
@@ -620,6 +620,7 @@
SRCS_MPLAYER-$(TGA) += libvo/vo_tga.c
SRCS_MPLAYER-$(V4L2) += libvo/vo_v4l2.c
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk
(original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk Tue
Jun 30 16:56:05 2009
@@ -1 +1 @@
-MPLAYER_TRUNK_VERSION=29374
+MPLAYER_TRUNK_VERSION=29408
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
