[MPlayer-dev-eng] [ANNOUNCE] MPlayer 0.90pre3 RPM packages available
Dominik Mierzejewski
dominik at rangers.eu.org
Mon May 13 01:48:04 CEST 2002
On Monday, 13 May 2002, Arpi wrote:
> Hi,
>
> > BTW: I've fixed my source package that is used to build mga_vid driver,
> > so that it now builds and installs without errors on both RedHat and
> > Mandrake, but the only person that contacted me so far still has
> > problems using it. He says insmod fails with:
> > [root at localhost taikku]# insmod mga_vid
> > Using /lib/modules/2.4.18-6mdk/kernel/drivers/char/mga_vid.o.gz
> > /lib/modules/2.4.18-6mdk/kernel/drivers/char/mga_vid.o.gz:
> > init_module: Input/output error
> > Hint: insmod errors can be caused by incorrect module parameters,
> > including invalid IO or IRQ parameters
> >
> > I told him to send me "strace modprobe mga_vid" output, but I'm not
> > holding my breath about its revealing something useful.
>
> i need 'dmesg' output.
OK, I'll tell him to send it here.
> either he has no supported matrox card, or he's using devfs but has
> /dev/mga_vid device created, so the devfs registration fails...
The latter. Do you know how to set up mga_vid with devfs?
It's not in the DOCS...
Another thing: is it OK if I build RPMs from latest (=today's) CVS now?
And here is a patch that fixes some of the compilation warnings (mostly
trivial ones):
--
MPlayer RPMs: http://msp-190.man.olsztyn.pl/~dominik/mplayer.html
"The Universe doesn't give you any points for doing things that are easy."
-- Sheridan to Garibaldi in Babylon 5:"The Geometry of Shadows"
Dominik 'Rathann' Mierzejewski <rathann(at)rangers.eu.org>
-------------- next part --------------
--- MPlayer-20020510/libao2/afmt.c.warn Fri May 10 21:41:46 2002
+++ MPlayer-20020510/libao2/afmt.c Sat May 11 01:10:59 2002
@@ -81,4 +81,4 @@
}
return 8;
-}
\ No newline at end of file
+}
--- MPlayer-20020510/libavcodec/mjpeg.c.warn Sat May 11 00:57:12 2002
+++ MPlayer-20020510/libavcodec/mjpeg.c Sat May 11 01:01:06 2002
@@ -622,6 +622,55 @@
init_vlc(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2);
}
+/* decode huffman tables and build VLC decoders */
+static int mjpeg_decode_dht(MJpegDecodeContext *s,
+ UINT8 *buf, int buf_size)
+{
+ int len, index, i, class, n, v, code_max;
+ UINT8 bits_table[17];
+ UINT8 val_table[256];
+
+ init_get_bits(&s->gb, buf, buf_size);
+
+ len = get_bits(&s->gb, 16);
+ len -= 2;
+
+ while (len > 0) {
+ if (len < 17)
+ return -1;
+ class = get_bits(&s->gb, 4);
+ if (class >= 2)
+ return -1;
+ index = get_bits(&s->gb, 4);
+ if (index >= 4)
+ return -1;
+ n = 0;
+ for(i=1;i<=16;i++) {
+ bits_table[i] = get_bits(&s->gb, 8);
+ n += bits_table[i];
+ }
+ len -= 17;
+ if (len < n || n > 256)
+ return -1;
+
+ code_max = 0;
+ for(i=0;i<n;i++) {
+ v = get_bits(&s->gb, 8);
+ if (v > code_max)
+ code_max = v;
+ val_table[i] = v;
+ }
+ len -= n;
+
+ /* build VLC and flush previous vlc if present */
+ free_vlc(&s->vlcs[class][index]);
+ dprintf("class=%d index=%d nb_codes=%d\n",
+ class, index, code_max + 1);
+ build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1);
+ }
+ return 0;
+}
+
static int mjpeg_decode_init(AVCodecContext *avctx)
{
MJpegDecodeContext *s = avctx->priv_data;
@@ -685,55 +734,6 @@
return 0;
}
-/* decode huffman tables and build VLC decoders */
-static int mjpeg_decode_dht(MJpegDecodeContext *s,
- UINT8 *buf, int buf_size)
-{
- int len, index, i, class, n, v, code_max;
- UINT8 bits_table[17];
- UINT8 val_table[256];
-
- init_get_bits(&s->gb, buf, buf_size);
-
- len = get_bits(&s->gb, 16);
- len -= 2;
-
- while (len > 0) {
- if (len < 17)
- return -1;
- class = get_bits(&s->gb, 4);
- if (class >= 2)
- return -1;
- index = get_bits(&s->gb, 4);
- if (index >= 4)
- return -1;
- n = 0;
- for(i=1;i<=16;i++) {
- bits_table[i] = get_bits(&s->gb, 8);
- n += bits_table[i];
- }
- len -= 17;
- if (len < n || n > 256)
- return -1;
-
- code_max = 0;
- for(i=0;i<n;i++) {
- v = get_bits(&s->gb, 8);
- if (v > code_max)
- code_max = v;
- val_table[i] = v;
- }
- len -= n;
-
- /* build VLC and flush previous vlc if present */
- free_vlc(&s->vlcs[class][index]);
- dprintf("class=%d index=%d nb_codes=%d\n",
- class, index, code_max + 1);
- build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1);
- }
- return 0;
-}
-
static int mjpeg_decode_sof0(MJpegDecodeContext *s,
UINT8 *buf, int buf_size)
{
--- MPlayer-20020510/libdha/mtrr.c.warn Fri May 10 21:41:46 2002
+++ MPlayer-20020510/libdha/mtrr.c Sat May 11 01:01:06 2002
@@ -8,6 +8,7 @@
#include "config.h"
#include <stdio.h>
+#include <string.h>
#include <errno.h>
#include "libdha.h"
#include "AsmMacros.h"
@@ -81,4 +82,4 @@
{
return ENOSYS;
}
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20020510/libmpcodecs/native/RTjpegN.c.warn Fri Dec 28 19:01:42 2001
+++ MPlayer-20020510/libmpcodecs/native/RTjpegN.c Sat May 11 01:01:06 2002
@@ -358,7 +358,7 @@
data[i]= 0;
break;
default:
-
+ break;
}
if( bitoff == 0 ) {
--- MPlayer-20020510/libmpcodecs/native/fli.c.warn Thu Feb 28 04:01:53 2002
+++ MPlayer-20020510/libmpcodecs/native/fli.c Sat May 11 01:01:06 2002
@@ -14,6 +14,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "config.h"
#include "bswap.h"
#include "mp_msg.h"
--- MPlayer-20020510/libmpcodecs/native/nuppelvideo.c.warn Sat Apr 13 20:05:57 2002
+++ MPlayer-20020510/libmpcodecs/native/nuppelvideo.c Sat May 11 01:01:06 2002
@@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
#include "config.h"
#include "mp_msg.h"
--- MPlayer-20020510/libmpcodecs/native/roqav.c.warn Fri Apr 19 19:35:27 2002
+++ MPlayer-20020510/libmpcodecs/native/roqav.c Sat May 11 01:01:06 2002
@@ -8,6 +8,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "config.h"
#include "bswap.h"
#include "mp_msg.h"
--- MPlayer-20020510/libmpcodecs/vd_zlib.c.warn Sat Mar 23 18:27:46 2002
+++ MPlayer-20020510/libmpcodecs/vd_zlib.c Sat May 11 01:01:06 2002
@@ -131,4 +131,4 @@
return mpi;
}
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20020510/libmpcodecs/dec_audio.c.warn Sun May 5 11:51:19 2002
+++ MPlayer-20020510/libmpcodecs/dec_audio.c Sat May 11 01:01:06 2002
@@ -26,6 +26,8 @@
static ad_functions_t* mpadec;
+void uninit_audio(sh_audio_t *sh_audio); /* forward declaration */
+
int init_audio(sh_audio_t *sh_audio)
{
unsigned i;
--- MPlayer-20020510/libmpcodecs/vf.c.warn Fri May 10 21:41:46 2002
+++ MPlayer-20020510/libmpcodecs/vf.c Sat May 11 01:01:06 2002
@@ -1,8 +1,11 @@
+#include "../config.h"
#include <stdio.h>
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
#include <stdlib.h>
#include <string.h>
-#include "../config.h"
#include "../mp_msg.h"
#include "img_format.h"
--- MPlayer-20020510/libmpcodecs/vd.c.warn Sun May 5 11:51:19 2002
+++ MPlayer-20020510/libmpcodecs/vd.c Sat May 11 01:01:06 2002
@@ -22,6 +22,8 @@
#include "vd.h"
#include "vf.h"
+#include "dec_video.h"
+
//#include "vd_internal.h"
extern vd_functions_t mpcodecs_vd_null;
--- MPlayer-20020510/libmpcodecs/mp_image.h.warn Sun Apr 21 12:44:17 2002
+++ MPlayer-20020510/libmpcodecs/mp_image.h Sat May 11 01:01:06 2002
@@ -1,6 +1,8 @@
#ifndef __MP_IMAGE_H
#define __MP_IMAGE_H 1
+#include <string.h>
+
// set if buffer content shouldn't be modified:
#define MP_IMGFLAG_PRESERVE 0x01
// set if buffer content will be READED for next frame's MC: (I/P mpeg frames)
--- MPlayer-20020510/libmpcodecs/vf_vo.c.warn Sat Apr 27 19:49:11 2002
+++ MPlayer-20020510/libmpcodecs/vf_vo.c Sat May 11 01:01:06 2002
@@ -44,7 +44,7 @@
int request, void* data){
switch(request){
case VFCTRL_DRAW_OSD:
- if(!vo_config_count) CONTROL_FALSE; // vo not configured?
+ if(!vo_config_count) return CONTROL_FALSE; // vo not configured?
video_out->draw_osd();
return CONTROL_TRUE;
}
--- MPlayer-20020510/loader/dshow/DS_VideoDecoder.h.warn Wed Jan 2 18:11:09 2002
+++ MPlayer-20020510/loader/dshow/DS_VideoDecoder.h Sat May 11 01:01:06 2002
@@ -23,6 +23,7 @@
int DS_VideoDecoder_SetDirection(DS_VideoDecoder *this, int d);
int DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value);
int DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value);
+int DS_SetAttr_DivX(char* attribute, int value);
#endif /* AVIFILE_DS_VIDEODECODER_H */
--- MPlayer-20020510/loader/win32.c.warn Mon Apr 29 13:47:44 2002
+++ MPlayer-20020510/loader/win32.c Sat May 11 01:01:06 2002
@@ -787,20 +787,6 @@
static int pf_set = 0;
static BYTE PF[64] = {0,};
-static WIN_BOOL WINAPI expIsProcessorFeaturePresent(DWORD v)
-{
- WIN_BOOL result;
- if(v>63)result=0;
- if (!pf_set)
- {
- SYSTEM_INFO si;
- expGetSystemInfo(&si);
- }
- else result=PF[v];
- dbgprintf("IsProcessorFeaturePresent(0x%x) => 0x%x\n", v, result);
- return result;
-}
-
static void DumpSystemInfo(const SYSTEM_INFO* si)
{
dbgprintf(" Processor architecture %d\n", si->u.s.wProcessorArchitecture);
@@ -1051,6 +1037,20 @@
DumpSystemInfo(si);
}
+static WIN_BOOL WINAPI expIsProcessorFeaturePresent(DWORD v)
+{
+ WIN_BOOL result;
+ if(v>63)result=0;
+ if (!pf_set)
+ {
+ SYSTEM_INFO si;
+ expGetSystemInfo(&si);
+ }
+ else result=PF[v];
+ dbgprintf("IsProcessorFeaturePresent(0x%x) => 0x%x\n", v, result);
+ return result;
+}
+
static long WINAPI expGetVersion()
{
dbgprintf("GetVersion() => 0xC0000004\n");
--- MPlayer-20020510/my_profile.h.warn Sun Nov 11 16:20:19 2001
+++ MPlayer-20020510/my_profile.h Sat May 11 01:01:06 2002
@@ -30,4 +30,4 @@
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20020510/dll_init.h.warn Thu Apr 11 04:52:28 2002
+++ MPlayer-20020510/dll_init.h Sat May 11 01:01:06 2002
@@ -4,9 +4,11 @@
extern char* win32_codec_name; // must be set before calling DrvOpen() !!!
int init_acm_audio_codec(sh_audio_t *sh_audio);
+int close_acm_audio_codec(sh_audio_t *sh_audio);
int acm_decode_audio(sh_audio_t *sh_audio, void* a_buffer,int minlen,int maxlen);
int init_vfw_video_codec(sh_video_t *sh_video,int ex);
+int vfw_close_video_codec(sh_video_t *sh_video, int ex);
int vfw_decode_video(sh_video_t* sh_video,void* start,int in_size,int drop_frame,int ex);
int vfw_set_postproc(sh_video_t* sh_video,int quality);
--- MPlayer-20020510/mmx_defs.h.warn Tue Oct 30 17:16:49 2001
+++ MPlayer-20020510/mmx_defs.h Sat May 11 01:01:06 2002
@@ -54,4 +54,4 @@
#endif
-#endif
\ No newline at end of file
+#endif
More information about the MPlayer-dev-eng
mailing list