summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-06 23:54:29 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-06 23:54:29 +0000
commitf859d013a883bbba59901303f644fe281454a63d (patch)
treee71729f1990b98ab27a8672e92a656d622c5ab19 /libmpdemux
parentd1d7c653674e32de3a4aa47ee4068c57b288adb7 (diff)
downloadmpv-f859d013a883bbba59901303f644fe281454a63d.tar.bz2
mpv-f859d013a883bbba59901303f644fe281454a63d.tar.xz
*HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/aviprint.c12
-rw-r--r--libmpdemux/demux_asf.c5
-rw-r--r--libmpdemux/demux_audio.c1
-rw-r--r--libmpdemux/demux_avi.c1
-rw-r--r--libmpdemux/demux_mpg.c3
-rw-r--r--libmpdemux/demux_ogg.c5
-rw-r--r--libmpdemux/demux_real.c2
-rw-r--r--libmpdemux/demuxer.c2
-rw-r--r--libmpdemux/open.c3
-rw-r--r--libmpdemux/tv.c4
-rw-r--r--libmpdemux/tvi_def.h1
11 files changed, 31 insertions, 8 deletions
diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c
index 87d02ea350..bdca364c36 100644
--- a/libmpdemux/aviprint.c
+++ b/libmpdemux/aviprint.c
@@ -64,7 +64,7 @@ void print_wave_header(WAVEFORMATEX *h){
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_wave_header(WAVEFORMATEX *h){
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");
}
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index c2b61a8731..37011bd8fd 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -232,7 +232,7 @@ int demux_asf_fill_buffer(demuxer_t *demux){
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");
@@ -344,6 +344,9 @@ int demux_asf_fill_buffer(demuxer_t *demux){
#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;
demux_stream_t *d_video=demuxer->video;
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index c0480b3af4..bc7c6308bd 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -28,6 +28,7 @@ typedef struct da_priv {
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;
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index 567217a82c..2394179b51 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -566,6 +566,7 @@ demuxer_t* demux_open_avi(demuxer_t* demuxer){
}
//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;
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c
index a2410c0217..5437d8a0e5 100644
--- a/libmpdemux/demux_mpg.c
+++ b/libmpdemux/demux_mpg.c
@@ -345,6 +345,9 @@ do{
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;
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index dd644429ca..60ad9482a9 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -440,6 +440,9 @@ void demux_ogg_build_syncpoints_table(demuxer_t* demuxer) {
}
+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;
@@ -869,6 +872,8 @@ demuxer_t* init_avi_with_ogg(demuxer_t* 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;
ogg_sync_state* sync = &ogg_d->sync;
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index b774aa29ef..4988cc9633 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -660,6 +660,8 @@ got_video:
}// goto loop;
}
+extern void print_wave_header(WAVEFORMATEX *h);
+
void demux_open_real(demuxer_t* demuxer)
{
real_priv_t* priv = demuxer->priv;
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index c53c1628a4..29a6d54e0d 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -522,6 +522,7 @@ extern int y4m_check_file(demuxer_t *demuxer);
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_ogg_open(demuxer_t* demuxer);
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);
diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index 0e1f9523d7..72bf95543d 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -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 @@ if(dvd_title){
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;
diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c
index 082bac691f..5c3b05bb13 100644
--- a/libmpdemux/tv.c
+++ b/libmpdemux/tv.c
@@ -108,6 +108,10 @@ int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds)
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;
diff --git a/libmpdemux/tvi_def.h b/libmpdemux/tvi_def.h
index aaa1f68c85..8e84ad1493 100644
--- a/libmpdemux/tvi_def.h
+++ b/libmpdemux/tvi_def.h
@@ -1,4 +1,5 @@
#include <stdlib.h> /* malloc */
+#include <string.h> /* memset */
static int init(priv_t *priv);
static int uninit(priv_t *priv);