[MPlayer-dev-eng] [PATCH] some trivial fixes [GUI, too]
Dominik 'Rathann' Mierzejewski
dominik at rangers.eu.org
Sun Oct 26 14:08:40 CET 2003
Hello.
Here are some trivial patches I made over the last few weeks:
mplayer-faad2_local.patch: fixes building with system faad2
mplayer-gui.patch: two warning fixes and a missing extern for GUI
mplayer-warnings.patch: some trivial warning fixes, missing includes and
a proper fix for "multi-character char constant" warning
mplayer-xmldoc.patch: adds RedHat stylesheet paths to configure
A note on building HTML docs from XML on RedHat: you need the following
packages: libxml2, libxslt, docbook-dtds, docbook-style-xsl.
--
MPlayer RPMs maintainer: http://www.piorunek.pl/~dominik/linux/pkgs/mplayer/
"The Universe doesn't give you any points for doing things that are easy."
-- Sheridan to Garibaldi in Babylon 5:"The Geometry of Shadows"
-------------- next part --------------
--- MPlayer-1.0pre2/configure.faad2 Sun Oct 5 17:34:40 2003
+++ MPlayer-1.0pre2/configure Sun Oct 5 23:02:58 2003
@@ -4385,6 +4385,7 @@
echocheck "faad2 (AAC) support"
_def_faad_internal="#undef USE_INTERNAL_FAAD"
if test "$_faad" = no ; then
+ _faad_local=no
echores "no (disabled)"
else
if test "$_faad_local" = no ; then
-------------- next part --------------
--- MPlayer-20030825/Gui/interface.c.gui Thu Aug 14 03:54:27 2003
+++ MPlayer-20030825/Gui/interface.c Wed Aug 27 23:13:30 2003
@@ -1045,7 +1045,7 @@
return NULL;
case gtkSetExtraStereo:
gtkAOExtraStereoMul=fparam;
- audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(int)>kAOExtraStereoMul );
+ audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(void *)>kAOExtraStereoMul );
return NULL;
case gtkSetPanscan:
{
@@ -1076,7 +1076,7 @@
if ( eq )
{
gtkEquChannels[eq->channel][eq->band]=eq->gain;
- audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)eq );
+ audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(void *)eq );
}
else
{
@@ -1084,7 +1084,7 @@
memset( gtkEquChannels,0,sizeof( gtkEquChannels ) );
for ( i=0;i<6;i++ )
for ( j=0;j<10;j++ )
- { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)&tmp ); }
+ { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(void *)&tmp ); }
}
return NULL;
}
--- MPlayer-20030825/Gui/cfg.c.gui Wed Aug 13 18:29:25 2003
+++ MPlayer-20030825/Gui/cfg.c Wed Aug 27 23:13:09 2003
@@ -72,6 +72,7 @@
extern int flip;
extern int frame_dropping;
extern int stop_xscreensaver;
+extern int m_config_parse_config_file(m_config_t* config, char *conffile);
static m_config_t * gui_conf;
static m_option_t gui_opts[] =
-------------- next part --------------
--- mplayer-20030930/libmpcodecs/vd_libmpeg2.c.warn Mon Aug 18 16:49:06 2003
+++ mplayer-20030930/libmpcodecs/vd_libmpeg2.c Tue Sep 30 23:38:57 2003
@@ -72,7 +72,7 @@
mpeg2_close (mpeg2dec);
}
-static void draw_slice (void * _sh, uint8_t ** src, unsigned int y){
+static void draw_slice (void * _sh, uint8_t * const * src, unsigned int y){
sh_video_t* sh = (sh_video_t*) _sh;
mpeg2dec_t* mpeg2dec = sh->context;
const mpeg2_info_t * info = mpeg2_info (mpeg2dec);
--- mplayer-20030930/libmpcodecs/pullup.c.warn Tue Sep 30 23:34:43 2003
+++ mplayer-20030930/libmpcodecs/pullup.c Tue Sep 30 23:38:57 2003
@@ -1,6 +1,8 @@
+#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "pullup.h"
#include "config.h"
@@ -321,7 +323,7 @@
}
}
-int pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity)
+void pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity)
{
struct pullup_field *f;
@@ -329,7 +331,7 @@
check_field_queue(c);
/* Cannot have two fields of same parity in a row; drop the new one */
- if (c->last && c->last->parity == parity) return 0;
+ if (c->last && c->last->parity == parity) return;
f = c->head;
f->parity = parity;
--- mplayer-20030930/libmpcodecs/pullup.h.warn Tue Sep 30 23:34:43 2003
+++ mplayer-20030930/libmpcodecs/pullup.h Tue Sep 30 23:38:57 2003
@@ -64,7 +64,7 @@
void pullup_release_buffer(struct pullup_buffer *b, int parity);
struct pullup_buffer *pullup_get_buffer(struct pullup_context *c, int parity);
-int pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity);
+void pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity);
void pullup_flush_fields(struct pullup_context *c);
struct pullup_frame *pullup_get_frame(struct pullup_context *c);
--- mplayer-20030930/libmpdemux/demux_ts.c.warn Sat Sep 13 23:54:15 2003
+++ mplayer-20030930/libmpdemux/demux_ts.c Tue Sep 30 23:38:57 2003
@@ -31,6 +31,7 @@
#include "stream.h"
#include "demuxer.h"
+#include "parse_es.h"
#include "stheader.h"
#include "bswap.h"
--- mplayer-20030930/libmpdemux/url.c.warn Sat May 3 08:16:07 2003
+++ mplayer-20030930/libmpdemux/url.c Tue Sep 30 23:38:57 2003
@@ -43,7 +43,7 @@
if( ptr1==NULL ) {
// Check for a special case: "sip:" (without "//"):
if (strstr(url, "sip:") == url) {
- ptr1 = &url[3]; // points to ':'
+ ptr1 = (char *)&url[3]; // points to ':'
jumpSize = 1;
} else {
mp_msg(MSGT_NETWORK,MSGL_V,"Not an URL!\n");
--- mplayer-20030930/libvo/vo_fbdev.c.warn Fri Aug 15 15:04:37 2003
+++ mplayer-20030930/libvo/vo_fbdev.c Tue Sep 30 23:38:57 2003
@@ -13,6 +13,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
+#include <ctype.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
--- mplayer-20030930/libvo/vo_fbdev2.c.warn Mon Sep 1 01:00:39 2003
+++ mplayer-20030930/libvo/vo_fbdev2.c Tue Sep 30 23:38:57 2003
@@ -4,6 +4,7 @@
* (C) 2003
*/
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
@@ -18,6 +19,7 @@
#include "video_out.h"
#include "video_out_internal.h"
#include "fastmemcpy.h"
+#include "sub.h"
#include "mp_msg.h"
static vo_info_t info = {
--- mplayer-20030930/loader/qtx/qtxsdk/components.h.warn Mon Dec 16 02:47:42 2002
+++ mplayer-20030930/loader/qtx/qtxsdk/components.h Tue Sep 30 23:38:57 2003
@@ -18,7 +18,7 @@
typedef unsigned long UInt32;
typedef signed long SInt32;
-#define FOUR_CHAR_CODE(x) ((unsigned long)(x)) /* otherwise compiler will complain about values with high bit set */
+#define FOUR_CHAR_CODE(a,b,c,d) ((unsigned long)(a)<<24 | (unsigned long)(b)<<16 | (unsigned long)(c)<<8 | (unsigned long)(d))
// codec private shit:
typedef void *GlobalsPtr;
@@ -154,22 +154,22 @@
/* values for PixMap.pixelFormat*/
enum {
- k16LE555PixelFormat = FOUR_CHAR_CODE('L555'), /* 16 bit LE rgb 555 (PC)*/
- k16LE5551PixelFormat = FOUR_CHAR_CODE('5551'), /* 16 bit LE rgb 5551*/
- k16BE565PixelFormat = FOUR_CHAR_CODE('B565'), /* 16 bit BE rgb 565*/
- k16LE565PixelFormat = FOUR_CHAR_CODE('L565'), /* 16 bit LE rgb 565*/
- k24BGRPixelFormat = FOUR_CHAR_CODE('24BG'), /* 24 bit bgr */
- k32BGRAPixelFormat = FOUR_CHAR_CODE('BGRA'), /* 32 bit bgra (Matrox)*/
- k32ABGRPixelFormat = FOUR_CHAR_CODE('ABGR'), /* 32 bit abgr */
- k32RGBAPixelFormat = FOUR_CHAR_CODE('RGBA'), /* 32 bit rgba */
- kYUVSPixelFormat = FOUR_CHAR_CODE('yuvs'), /* YUV 4:2:2 byte ordering 16-unsigned = 'YUY2'*/
- kYUVUPixelFormat = FOUR_CHAR_CODE('yuvu'), /* YUV 4:2:2 byte ordering 16-signed*/
- kYVU9PixelFormat = FOUR_CHAR_CODE('YVU9'), /* YVU9 Planar 9*/
- kYUV411PixelFormat = FOUR_CHAR_CODE('Y411'), /* YUV 4:1:1 Interleaved 16*/
- kYVYU422PixelFormat = FOUR_CHAR_CODE('YVYU'), /* YVYU 4:2:2 byte ordering 16*/
- kUYVY422PixelFormat = FOUR_CHAR_CODE('UYVY'), /* UYVY 4:2:2 byte ordering 16*/
- kYUV211PixelFormat = FOUR_CHAR_CODE('Y211'), /* YUV 2:1:1 Packed 8*/
- k2vuyPixelFormat = FOUR_CHAR_CODE('2vuy') /* UYVY 4:2:2 byte ordering 16*/
+ k16LE555PixelFormat = FOUR_CHAR_CODE('L','5','5','5'), /* 16 bit LE rgb 555 (PC)*/
+ k16LE5551PixelFormat = FOUR_CHAR_CODE('5','5','5','1'), /* 16 bit LE rgb 5551*/
+ k16BE565PixelFormat = FOUR_CHAR_CODE('B','5','6','5'), /* 16 bit BE rgb 565*/
+ k16LE565PixelFormat = FOUR_CHAR_CODE('L','5','6','5'), /* 16 bit LE rgb 565*/
+ k24BGRPixelFormat = FOUR_CHAR_CODE('2','4','B','G'), /* 24 bit bgr */
+ k32BGRAPixelFormat = FOUR_CHAR_CODE('B','G','R','A'), /* 32 bit bgra (Matrox)*/
+ k32ABGRPixelFormat = FOUR_CHAR_CODE('A','B','G','R'), /* 32 bit abgr */
+ k32RGBAPixelFormat = FOUR_CHAR_CODE('R','G','B','A'), /* 32 bit rgba */
+ kYUVSPixelFormat = FOUR_CHAR_CODE('y','u','v','s'), /* YUV 4:2:2 byte ordering 16-unsigned = 'YUY2'*/
+ kYUVUPixelFormat = FOUR_CHAR_CODE('y','u','v','u'), /* YUV 4:2:2 byte ordering 16-signed*/
+ kYVU9PixelFormat = FOUR_CHAR_CODE('Y','V','U','9'), /* YVU9 Planar 9*/
+ kYUV411PixelFormat = FOUR_CHAR_CODE('Y','4','1','1'), /* YUV 4:1:1 Interleaved 16*/
+ kYVYU422PixelFormat = FOUR_CHAR_CODE('Y','V','Y','U'), /* YVYU 4:2:2 byte ordering 16*/
+ kUYVY422PixelFormat = FOUR_CHAR_CODE('U','Y','V','Y'), /* UYVY 4:2:2 byte ordering 16*/
+ kYUV211PixelFormat = FOUR_CHAR_CODE('Y','2','1','1'), /* YUV 2:1:1 Packed 8*/
+ k2vuyPixelFormat = FOUR_CHAR_CODE('2','v','u','y') /* UYVY 4:2:2 byte ordering 16*/
};
struct __attribute__((__packed__)) PixMapExtension {
--- mplayer-20030930/m_option.c.warn Sat Sep 13 23:54:14 2003
+++ mplayer-20030930/m_option.c Tue Sep 30 23:38:57 2003
@@ -11,6 +11,7 @@
#include "m_option.h"
//#include "m_config.h"
#include "mp_msg.h"
+#include "libmpdemux/url.h"
// Don't free for 'production' atm
#ifndef MP_DEBUG
-------------- next part --------------
--- MPlayer-20031026/DOCS/xml/configure.xmldoc Sun Oct 26 12:49:00 2003
+++ MPlayer-20031026/DOCS/xml/configure Sun Oct 26 13:43:02 2003
@@ -6,7 +6,7 @@
_xsltwrapper="xsltproc.sh"
_xmllintwrapper="xmllint.sh"
-for _try_catalog in /etc/sgml/catalog /usr/share/sgml/docbook/xml-dtd-4.1.2/xmlcatalog /usr/share/apps/ksgmltools2/customization/en/catalog /usr/share/sgml/catalog /usr/local/share/sgml/catalog /usr/lib/sgml/catalog /usr/local/lib/sgml/catalog /usr/share/docbook-xml42/catalog.xml
+for _try_catalog in /etc/sgml/catalog /usr/share/sgml/docbook/xml-dtd-4.1.2/xmlcatalog /usr/share/apps/ksgmltools2/customization/en/catalog /usr/share/sgml/catalog /usr/local/share/sgml/catalog /usr/lib/sgml/catalog /usr/local/lib/sgml/catalog /usr/share/docbook-xml42/catalog.xml /usr/share/sgml/docbook/xmlcatalog
do
if test -f "$_try_catalog"
then
@@ -27,7 +27,7 @@
echo "Searching for stylesheets..."
echo "Searching for html/chunk.xsl..."
-for _try_chunk_xsl in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl /usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl /usr/local/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl /usr/local/share/sgml/docbook/yelp/docbook/html/chunk.xsl /usr/share/docbook-xsl/html/chunk.xsl
+for _try_chunk_xsl in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl /usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl /usr/local/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl /usr/local/share/sgml/docbook/yelp/docbook/html/chunk.xsl /usr/share/docbook-xsl/html/chunk.xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl
do
if test -f "$_try_chunk_xsl"
then
@@ -46,7 +46,7 @@
fi
echo "Searching for html/docbook.xsl..."
-for _try_docbook_xsl in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl /usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl /usr/local/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl /usr/local/share/sgml/docbook/yelp/docbook/html/docbook.xsl /usr/share/docbook-xsl/html/docbook.xsl
+for _try_docbook_xsl in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl /usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl /usr/local/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl /usr/local/share/sgml/docbook/yelp/docbook/html/docbook.xsl /usr/share/docbook-xsl/html/docbook.xsl /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl
do
if test -f "$_try_docbook_xsl"
then
More information about the MPlayer-dev-eng
mailing list