[Mplayer-cvslog] CVS: main/libmpdemux aviprint.c,1.15,1.16 demux_asf.c,1.23,1.24 demux_audio.c,1.14,1.15 demux_avi.c,1.49,1.50 demux_mpg.c,1.43,1.44 demux_ogg.c,1.17,1.18 demux_real.c,1.32,1.33 demuxer.c,1.121,1.122 open.c,1.62,1.63 tv.c,1.38,1.39 tvi_def.h,1.7,1.8
Arpi of Ize
arpi at mplayerhq.hu
Thu Nov 7 00:54:59 CET 2002
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv16361/libmpdemux
Modified Files:
aviprint.c demux_asf.c demux_audio.c demux_avi.c demux_mpg.c
demux_ogg.c demux_real.c demuxer.c open.c tv.c tvi_def.h
Log Message:
*HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik at rangers.eu.org>
Index: aviprint.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviprint.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aviprint.c 22 Sep 2002 00:43:14 -0000 1.15
+++ aviprint.c 6 Nov 2002 23:54:26 -0000 1.16
@@ -64,7 +64,7 @@
if(h->wFormatTag==0x55 && h->cbSize>=12){
MPEGLAYER3WAVEFORMAT* h2=(MPEGLAYER3WAVEFORMAT *)h;
printf("mp3.wID=%d\n",h2->wID);
- printf("mp3.fdwFlags=0x%X\n",h2->fdwFlags);
+ printf("mp3.fdwFlags=0x%lX\n",h2->fdwFlags);
printf("mp3.nBlockSize=%d\n",h2->nBlockSize);
printf("mp3.nFramesPerBlock=%d\n",h2->nFramesPerBlock);
printf("mp3.nCodecDelay=%d\n",h2->nCodecDelay);
@@ -83,13 +83,13 @@
void print_video_header(BITMAPINFOHEADER *h){
printf("======= VIDEO Format ======\n");
- printf(" biSize %ld\n", h->biSize);
- printf(" biWidth %ld\n", h->biWidth);
- printf(" biHeight %ld\n", h->biHeight);
+ printf(" biSize %d\n", h->biSize);
+ printf(" biWidth %d\n", h->biWidth);
+ printf(" biHeight %d\n", h->biHeight);
printf(" biPlanes %d\n", h->biPlanes);
printf(" biBitCount %d\n", h->biBitCount);
- printf(" biCompression %ld='%.4s'\n", h->biCompression, (char *)&h->biCompression);
- printf(" biSizeImage %ld\n", h->biSizeImage);
+ printf(" biCompression %d='%.4s'\n", h->biCompression, (char *)&h->biCompression);
+ printf(" biSizeImage %d\n", h->biSizeImage);
printf("===========================\n");
}
Index: demux_asf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_asf.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- demux_asf.c 22 Sep 2002 02:33:26 -0000 1.23
+++ demux_asf.c 6 Nov 2002 23:54:26 -0000 1.24
@@ -232,7 +232,7 @@
unsigned int rlen;
//
int len;
- unsigned int time2;
+ unsigned int time2=0;
int keyframe=0;
if(p>=p_end) mp_msg(MSGT_DEMUX,MSGL_V,"Warning! invalid packet 1, sig11 coming soon...\n");
@@ -343,6 +343,9 @@
}
#include "stheader.h"
+
+extern void resync_audio_stream(sh_audio_t *sh_audio);
+extern void skip_audio_frame(sh_audio_t *sh_audio);
void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags){
demux_stream_t *d_audio=demuxer->audio;
Index: demux_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_audio.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- demux_audio.c 5 Nov 2002 23:28:52 -0000 1.14
+++ demux_audio.c 6 Nov 2002 23:54:26 -0000 1.15
@@ -28,6 +28,7 @@
extern void free_sh_audio(sh_audio_t* sh);
extern void resync_audio_stream(sh_audio_t *sh_audio);
+extern void print_wave_header(WAVEFORMATEX *h);
int hr_mp3_seek = 0;
Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- demux_avi.c 2 Nov 2002 21:52:48 -0000 1.49
+++ demux_avi.c 6 Nov 2002 23:54:26 -0000 1.50
@@ -566,6 +566,7 @@
}
//extern float initial_pts_delay;
+extern void resync_audio_stream(sh_audio_t *sh_audio);
void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){
avi_priv_t *priv=demuxer->priv;
Index: demux_mpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- demux_mpg.c 8 Oct 2002 22:57:39 -0000 1.43
+++ demux_mpg.c 6 Nov 2002 23:54:26 -0000 1.44
@@ -345,6 +345,9 @@
return 1;
}
+extern void resync_audio_stream(sh_audio_t *sh_audio);
+extern void skip_audio_frame(sh_audio_t *sh_audio);
+
void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){
demux_stream_t *d_audio=demuxer->audio;
demux_stream_t *d_video=demuxer->video;
Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- demux_ogg.c 1 Nov 2002 17:46:43 -0000 1.17
+++ demux_ogg.c 6 Nov 2002 23:54:26 -0000 1.18
@@ -440,6 +440,9 @@
}
+extern void print_wave_header(WAVEFORMATEX *h);
+extern void print_video_header(BITMAPINFOHEADER *h);
+
/// Open an ogg physical stream
int demux_ogg_open(demuxer_t* demuxer) {
ogg_demuxer_t* ogg_d;
@@ -868,6 +871,8 @@
return demuxer;
}
+
+extern void resync_audio_stream(sh_audio_t *sh_audio);
void demux_ogg_seek(demuxer_t *demuxer,float rel_seek_secs,int flags) {
ogg_demuxer_t* ogg_d = demuxer->priv;
Index: demux_real.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- demux_real.c 5 Nov 2002 15:28:17 -0000 1.32
+++ demux_real.c 6 Nov 2002 23:54:26 -0000 1.33
@@ -660,6 +660,8 @@
}// goto loop;
}
+extern void print_wave_header(WAVEFORMATEX *h);
+
void demux_open_real(demuxer_t* demuxer)
{
real_priv_t* priv = demuxer->priv;
Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- demuxer.c 2 Nov 2002 19:52:59 -0000 1.121
+++ demuxer.c 6 Nov 2002 23:54:26 -0000 1.122
@@ -522,6 +522,7 @@
extern void demux_open_y4m(demuxer_t *demuxer);
extern int roq_check_file(demuxer_t *demuxer);
extern int pva_check_file(demuxer_t * demuxer);
+extern demuxer_t * demux_open_pva(demuxer_t * demuxer);
extern int real_check_file(demuxer_t *demuxer);
extern void demux_open_real(demuxer_t *demuxer);
extern int nuv_check_file(demuxer_t *demuxer);
@@ -531,6 +532,7 @@
extern int demux_rawaudio_open(demuxer_t* demuxer);
extern int smjpeg_check_file(demuxer_t *demuxer);
extern int demux_open_smjpeg(demuxer_t* demuxer);
+extern int bmp_check_file(demuxer_t *demuxer);
extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer);
Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- open.c 22 Oct 2002 22:45:30 -0000 1.62
+++ open.c 6 Nov 2002 23:54:26 -0000 1.63
@@ -22,6 +22,7 @@
#ifdef STREAMING
#include "url.h"
#include "network.h"
+extern int streaming_start( stream_t *stream, int *demuxer_type, URL_t *url);
#ifdef STREAMING_LIVE_DOT_COM
#include "demux_rtp.h"
int isSDPFile = 0;
@@ -531,7 +532,7 @@
int dvd_parse_chapter_range(struct config *conf, const char *range){
const char *s;
char *t;
- conf; /* prevent warning from GCC */
+/* conf; prevent warning from GCC */
s = range;
dvd_chapter = 1;
dvd_last_chapter = 0;
Index: tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- tv.c 25 Oct 2002 09:42:41 -0000 1.38
+++ tv.c 6 Nov 2002 23:54:26 -0000 1.39
@@ -108,6 +108,10 @@
return 1;
}
+ /* forward declarations */
+int tv_set_freq(tvi_handle_t *tvh, unsigned long freq);
+int tv_get_freq(tvi_handle_t *tvh, unsigned long *freq);
+
static int open_tv(tvi_handle_t *tvh)
{
int i;
Index: tvi_def.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_def.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tvi_def.h 12 Apr 2002 10:40:38 -0000 1.7
+++ tvi_def.h 6 Nov 2002 23:54:26 -0000 1.8
@@ -1,4 +1,5 @@
#include <stdlib.h> /* malloc */
+#include <string.h> /* memset */
static int init(priv_t *priv);
static int uninit(priv_t *priv);
More information about the MPlayer-cvslog
mailing list