SOURCES (DEVEL): mplayer-on2flix.patch - update to mplayer-2007-06...
glen
glen at pld-linux.org
Wed Jun 27 00:17:25 CEST 2007
Author: glen Date: Tue Jun 26 22:17:25 2007 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- update to mplayer-2007-06-26, on2-2007-06-21
---- Files affected:
SOURCES:
mplayer-on2flix.patch (1.1 -> 1.1.2.1)
---- Diffs:
================================================================
Index: SOURCES/mplayer-on2flix.patch
diff -u SOURCES/mplayer-on2flix.patch:1.1 SOURCES/mplayer-on2flix.patch:1.1.2.1
--- SOURCES/mplayer-on2flix.patch:1.1 Sat Dec 9 14:46:37 2006
+++ SOURCES/mplayer-on2flix.patch Wed Jun 27 00:17:20 2007
@@ -1,36 +1,86 @@
---- MPlayer-1.0rc1/mencoder-on2flixenglinux/add_ogg_mux_demux.diff~ 2006-10-16 21:18:07.000000000 +0300
-+++ MPlayer-1.0rc1/mencoder-on2flixenglinux/add_ogg_mux_demux.diff 2006-12-09 15:31:25.231011265 +0200
-@@ -109,10 +109,10 @@
- uint64_t get_uint64 (const void *buf)
- {
- uint64_t ret;
--@@ -395,6 +413,42 @@
-+@@ -411,6 +411,42 @@
-+ #endif /* HAVE_OGGTHEORA */
- } else if (os->flac) {
+--- mplayer-export-2007-06-26/mencoder-on2flixenglinux/add_ogg_mux_demux.diff~ 2007-04-03 17:47:41.000000000 +0300
++++ mplayer-export-2007-06-26/mencoder-on2flixenglinux/add_ogg_mux_demux.diff 2007-06-26 23:35:39.542628840 +0300
+@@ -17,18 +17,16 @@
+ " rawvideo - (video only, one stream only) raw stream, no muxing\n"
+ " rawaudio - (audio only, one stream only) raw stream, no muxing\n"
+ "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+-Index: libmpdemux/Makefile
+-===================================================================
+---- libmpdemux/Makefile (revision 22906)
+-+++ libmpdemux/Makefile (working copy)
+-@@ -62,6 +62,7 @@
++--- libmpdemux/Makefile~ 2007-06-26 23:34:05.680539505 +0300
+++++ libmpdemux/Makefile 2007-06-26 23:35:06.021882602 +0300
++@@ -61,6 +61,7 @@
+ muxer_rawaudio.c \
+ muxer_rawvideo.c \
+
+-+SRCS_MENCODER += muxer_ogg.c oggpcm.c ogguvs.c
+- SRCS_MENCODER-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c
+- SRCS_MENCODER-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c
+++SRCS_MENCODER += muxer_ogg.c oggpcm.c ogguvs.c
++ SRCS_MENCODER-$(LIBAVFORMAT) += muxer_lavf.c
+
++ include ../mpcommon.mak
+ Index: libmpdemux/muxer.c
+ ===================================================================
+ --- libmpdemux/muxer.c (revision 22906)
+--- mplayer-export-2007-06-26/mencoder-on2flixenglinux/add_ogg_mux_demux.diff~ 2007-06-26 23:39:06.307233710 +0300
++++ mplayer-export-2007-06-26/mencoder-on2flixenglinux/add_ogg_mux_demux.diff 2007-06-26 23:39:55.148321916 +0300
+@@ -72,10 +72,13 @@
+ int id;
+
+ vorbis_info vi;
+-@@ -190,6 +192,22 @@
+- }
++--- libmpdemux/demux_ogg.c~ 2007-06-26 23:36:35.963885083 +0300
+++++ libmpdemux/demux_ogg.c 2007-06-26 23:37:52.535590369 +0300
++@@ -166,6 +166,22 @@
++ #define get_uint32(b) AV_RL32(b)
++ #define get_uint64(b) AV_RL64(b)
+
+- static
+++static
+ +uint32_t get_be_uint32 (const void *buf)
+ +{
+ + uint32_t ret;
+@@ -91,10 +94,11 @@
+ + return (ret);
+ +}
+ +
+-+static
+- uint64_t get_uint64 (const void *buf)
+- {
+- uint64_t ret;
++ void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) {
++ int lcv;
++ char *packet = pack->packet;
++--- libmpdemux/demux_ogg.c (revision 22906)
+++++ libmpdemux/demux_ogg.c (working copy)
+ @@ -352,6 +370,42 @@
/* we pass complete packets to flac, mustn't strip the header! */
-- #endif /* HAVE_FLAC */
- + } else if (os->pcm) {
- + data = pack->packet;
- + *flags = 1;
---- MPlayer-1.0rc1/mencoder-on2flixenglinux/version.diff~ 2006-10-16 21:21:12.000000000 +0300
-+++ MPlayer-1.0rc1/mencoder-on2flixenglinux/version.diff 2006-12-09 15:32:18.792217093 +0200
-@@ -1,14 +1,6 @@
- --- ../mplayer/version.sh 2006-09-26 09:52:52.000000000 -0400
- +++ version.sh 2006-10-11 10:34:17.000000000 -0400
--@@ -5,9 +5,9 @@
-- svn_revision=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
-- test $svn_revision || svn_revision=`grep revision .svn/entries | \
-- cut -d '"' -f2 2> /dev/null`
---test $svn_revision || svn_revision=UNKNOWN
--+test $svn_revision || svn_revision=`cat svn_snapshot_id`-snapshot
+ if (os->flac == 2 && pack->packet[0] != 0xff)
+--- mplayer-export-2007-06-26/mencoder-on2flixenglinux/ve_raw_stride_support.diff~ 2007-06-26 23:46:21.446934769 +0300
++++ mplayer-export-2007-06-26/mencoder-on2flixenglinux/ve_raw_stride_support.diff 2007-06-26 23:48:10.869376259 +0300
+@@ -89,15 +89,17 @@
+ switch (fmt) {
+ case IMGFMT_I420:
+ case IMGFMT_IYUV:
+-@@ -111,15 +166,33 @@
++--- libmpcodecs/ve_raw.c~ 2007-06-26 23:40:28.269059962 +0300
+++++ libmpcodecs/ve_raw.c 2007-06-26 23:42:35.241890085 +0300
++@@ -169,6 +169,7 @@
+ case IMGFMT_YUY2:
+ case IMGFMT_YVU9:
+ case IMGFMT_IF09:
+-- return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
+ + return supported;
++ case IMGFMT_Y8:
++ return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
+ }
-
---NEW_REVISION="#define VERSION \"dev-SVN-r${svn_revision}${extra}\""
--+NEW_REVISION="#define VERSION \"on2-SVN-${svn_revision}${extra}\""
-- OLD_REVISION=`cat version.h 2> /dev/null`
--
-- # Update version.h only on revision changes to avoid spurious rebuilds
-+@@ -1,2 +1,2 @@
-+ #!/bin/sh
-+-echo "#define VERSION \"1.0rc1-$1\"" > version.h
-++echo "#define VERSION \"1.0rc1-on2-$1\"" > version.h
+- return 0;
++@@ -177,8 +178,26 @@
+ }
+
+ static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mplayer-on2flix.patch?r1=1.1&r2=1.1.2.1&f=u
More information about the pld-cvs-commit
mailing list