diff options
55 files changed, 136 insertions, 95 deletions
diff --git a/cfgparser.c b/cfgparser.c index 714f1d0300..38bb5e8a7a 100644 --- a/cfgparser.c +++ b/cfgparser.c @@ -763,7 +763,7 @@ static int config_read_option(m_config_t *config,config_t** conf_list, char *opt goto err_missing_param; if (sscanf(param, sizeof(off_t) == sizeof(int) ? - "%d%c" : "%lld%c", &tmp_off, &dummy) != 1) { + "%d%c" : "%lld%c", &tmp_off, (char *)&dummy) != 1) { mp_msg(MSGT_CFGPARSER, MSGL_ERR, "parameter must be an integer: %s\n", param); ret = ERR_OUT_OF_RANGE; goto out; diff --git a/cpudetect.c b/cpudetect.c index 6ed4015a10..cf466fb400 100644 --- a/cpudetect.c +++ b/cpudetect.c @@ -12,6 +12,7 @@ CpuCaps gCpuCaps; #ifdef ARCH_X86 #include <stdio.h> +#include <string.h> #ifdef __FreeBSD__ #include <sys/types.h> diff --git a/liba52/resample_mmx.c b/liba52/resample_mmx.c index 7cee365749..a4079798f7 100644 --- a/liba52/resample_mmx.c +++ b/liba52/resample_mmx.c @@ -13,7 +13,6 @@ static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL; static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL; static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){ - int i; int32_t * f = (int32_t *) _f; asm volatile( "movl $-512, %%esi \n\t" @@ -51,7 +50,6 @@ static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){ } static int a52_resample_STEREO_to_2_MMX(float * _f, int16_t * s16){ - int i; int32_t * f = (int32_t *) _f; /* benchmark scores are 0.3% better with SSE but we would need to set bias=0 and premultiply it #ifdef HAVE_SSE @@ -100,7 +98,6 @@ static int a52_resample_STEREO_to_2_MMX(float * _f, int16_t * s16){ } static int a52_resample_3F_to_5_MMX(float * _f, int16_t * s16){ - int i; int32_t * f = (int32_t *) _f; asm volatile( "movl $-1024, %%esi \n\t" @@ -156,7 +153,6 @@ static int a52_resample_3F_to_5_MMX(float * _f, int16_t * s16){ } static int a52_resample_2F_2R_to_4_MMX(float * _f, int16_t * s16){ - int i; int32_t * f = (int32_t *) _f; asm volatile( "movl $-1024, %%esi \n\t" @@ -208,7 +204,6 @@ static int a52_resample_2F_2R_to_4_MMX(float * _f, int16_t * s16){ } static int a52_resample_3F_2R_to_5_MMX(float * _f, int16_t * s16){ - int i; int32_t * f = (int32_t *) _f; asm volatile( "movl $-1024, %%esi \n\t" @@ -268,7 +263,6 @@ static int a52_resample_3F_2R_to_5_MMX(float * _f, int16_t * s16){ } static int a52_resample_MONO_LFE_to_6_MMX(float * _f, int16_t * s16){ - int i; int32_t * f = (int32_t *) _f; asm volatile( "movl $-1024, %%esi \n\t" @@ -309,7 +303,6 @@ static int a52_resample_MONO_LFE_to_6_MMX(float * _f, int16_t * s16){ } static int a52_resample_STEREO_LFE_to_6_MMX(float * _f, int16_t * s16){ - int i; int32_t * f = (int32_t *) _f; asm volatile( "movl $-1024, %%esi \n\t" @@ -348,7 +341,6 @@ static int a52_resample_STEREO_LFE_to_6_MMX(float * _f, int16_t * s16){ } static int a52_resample_3F_LFE_to_6_MMX(float * _f, int16_t * s16){ - int i; int32_t * f = (int32_t *) _f; asm volatile( "movl $-1024, %%esi \n\t" @@ -389,7 +381,6 @@ static int a52_resample_3F_LFE_to_6_MMX(float * _f, int16_t * s16){ } static int a52_resample_2F_2R_LFE_to_6_MMX(float * _f, int16_t * s16){ - int i; int32_t * f = (int32_t *) _f; asm volatile( "movl $-1024, %%esi \n\t" @@ -436,7 +427,6 @@ static int a52_resample_2F_2R_LFE_to_6_MMX(float * _f, int16_t * s16){ } static int a52_resample_3F_2R_LFE_to_6_MMX(float * _f, int16_t * s16){ - int i; int32_t * f = (int32_t *) _f; asm volatile( "movl $-1024, %%esi \n\t" diff --git a/libao2/ao_arts.c b/libao2/ao_arts.c index d660ebbcf3..9f012b551e 100644 --- a/libao2/ao_arts.c +++ b/libao2/ao_arts.c @@ -44,7 +44,7 @@ static int init(int rate_hz, int channels, int format, int flags) int err; int frag_spec; - if(err=arts_init()) { + if( (err=arts_init()) ) { mp_msg(MSGT_AO, MSGL_ERR, "AO: [arts] %s\n", arts_error_text(err)); return 0; } diff --git a/libao2/pl_eq.c b/libao2/pl_eq.c index 1799fd76c8..30e7a390ac 100644 --- a/libao2/pl_eq.c +++ b/libao2/pl_eq.c @@ -118,7 +118,7 @@ static void reset(){ // open & setup audio device // return: 1=success 0=fail static int init(){ - int c,k = 0; + int k = 0; float F[KM] = CF; // Check input format diff --git a/libao2/pl_resample.c b/libao2/pl_resample.c index 8cecb7bce8..d948ba6e7b 100644 --- a/libao2/pl_resample.c +++ b/libao2/pl_resample.c @@ -160,6 +160,10 @@ static void uninit(){ static void reset(){ } +/* forward declarations */ +int upsample(); +int downsample(); + // processes 'ao_plugin_data.len' bytes of 'data' // called for every block of data // FIXME: this routine needs to be optimized (it is probably possible to do a lot here) diff --git a/libao2/pl_surround.c b/libao2/pl_surround.c index dad0cbafcf..a7e629b0e3 100644 --- a/libao2/pl_surround.c +++ b/libao2/pl_surround.c @@ -173,7 +173,7 @@ static double steering_matrix[][12] = { }; // Experimental moving average dominances -static int amp_L = 0, amp_R = 0, amp_C = 0, amp_S = 0; +//static int amp_L = 0, amp_R = 0, amp_C = 0, amp_S = 0; // processes 'ao_plugin_data.len' bytes of 'data' // called for every block of data diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c index 32ee3798ac..a665b264c2 100644 --- a/libmpcodecs/ad_acm.c +++ b/libmpcodecs/ad_acm.c @@ -39,11 +39,13 @@ static int init(sh_audio_t *sh_audio) return 1; } +extern void print_wave_header(WAVEFORMATEX *h); + static int preinit(sh_audio_t *sh_audio) { HRESULT ret; WAVEFORMATEX *in_fmt = sh_audio->wf; - unsigned int srcsize = 0; + DWORD srcsize = 0; acm_context_t *priv; priv = malloc(sizeof(acm_context_t)); diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index bf4b39d0fe..f5dd76ec13 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -192,11 +192,11 @@ static int preinit(sh_audio_t *sh){ WantedBufferSize=OutputFormatInfo.numChannels*OutputFormatInfo.sampleRate*2; error = SoundConverterGetBufferSizes(myConverter, WantedBufferSize,&FramesToGet,&InputBufferSize,&OutputBufferSize); - printf("SoundConverterGetBufferSizes:%i\n"); - printf("WantedBufferSize = %i\n",WantedBufferSize); - printf("InputBufferSize = %i\n",InputBufferSize); - printf("OutputBufferSize = %i\n",OutputBufferSize); - printf("FramesToGet = %i\n",FramesToGet); + printf("SoundConverterGetBufferSizes:%i\n",error); + printf("WantedBufferSize = %li\n",WantedBufferSize); + printf("InputBufferSize = %li\n",InputBufferSize); + printf("OutputBufferSize = %li\n",OutputBufferSize); + printf("FramesToGet = %li\n",FramesToGet); InFrameSize=InputBufferSize/FramesToGet; OutFrameSize=OutputBufferSize/FramesToGet; @@ -256,7 +256,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) InputBufferSize=FramesToGet*InFrameSize; - printf("FramesToGet = %i (%i -> %i bytes)\n",FramesToGet, + printf("FramesToGet = %li (%li -> %li bytes)\n",FramesToGet, InputBufferSize, FramesToGet*OutFrameSize); if(InputBufferSize>sh->a_in_buffer_len){ @@ -270,8 +270,8 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) error = SoundConverterConvertBuffer(myConverter,sh->a_in_buffer, FramesToGet,buf,&ConvertedFrames,&ConvertedBytes); printf("SoundConverterConvertBuffer:%i\n",error); - printf("ConvertedFrames = %i\n",ConvertedFrames); - printf("ConvertedBytes = %i\n",ConvertedBytes); + printf("ConvertedFrames = %li\n",ConvertedFrames); + printf("ConvertedBytes = %li\n",ConvertedBytes); InputBufferSize=(ConvertedBytes/OutFrameSize)*InFrameSize; // FIXME!! sh->a_in_buffer_len-=InputBufferSize; diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index df791abbf3..60d536e043 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -45,7 +45,6 @@ void afm_help(){ int init_audio_codec(sh_audio_t *sh_audio) { - unsigned i; // reset in/out buffer size/pointer: sh_audio->a_buffer_size=0; @@ -166,6 +165,8 @@ int init_audio(sh_audio_t *sh_audio,char* codecname,char* afm,int status){ return 0; } +extern char *get_path(char *filename); + int init_best_audio_codec(sh_audio_t *sh_audio,char** audio_codec_list,char** audio_fm_list){ char* ac_l_default[2]={"",(char*)NULL}; // hack: diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index 7af07541ee..fd93031494 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -202,6 +202,8 @@ int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status){ return 0; } +extern char *get_path(char *filename); + int init_best_video_codec(sh_video_t *sh_video,char** video_codec_list,char** video_fm_list){ char* vc_l_default[2]={"",(char*)NULL}; // hack: diff --git a/libmpcodecs/native/qtrpza.c b/libmpcodecs/native/qtrpza.c index 024bca5b42..6f0db5f921 100644 --- a/libmpcodecs/native/qtrpza.c +++ b/libmpcodecs/native/qtrpza.c @@ -130,7 +130,6 @@ void qt_decode_rpza(char *encoded, int encoded_size, char *decoded, int width, int height, int bytes_per_pixel) { - int i; int stream_ptr = 0; int chunk_size; unsigned char opcode; @@ -145,7 +144,6 @@ void qt_decode_rpza(char *encoded, int encoded_size, char *decoded, int width, int pixel_ptr = 0; int pixel_x, pixel_y; int row_inc = bytes_per_pixel * (width - 4); - int max_height = row_inc * height; int block_x_inc = bytes_per_pixel * 4; int block_y_inc = bytes_per_pixel * width; int block_ptr; diff --git a/libmpcodecs/vd_lzo.c b/libmpcodecs/vd_lzo.c index d475b8256b..56fa36eddf 100644 --- a/libmpcodecs/vd_lzo.c +++ b/libmpcodecs/vd_lzo.c @@ -98,10 +98,8 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) { static int init_done = 0; int r; - int cb = 1; - int cr = 2; mp_image_t* mpi; - int w, h; + int w; lzo_context_t *priv = sh->context; if (len <= 0) { diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c index 9d6e82ce6e..f3f77da9a7 100644 --- a/libmpcodecs/vd_vfw.c +++ b/libmpcodecs/vd_vfw.c @@ -138,6 +138,8 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ return CONTROL_UNKNOWN; } +extern void print_video_header(BITMAPINFOHEADER *h); + // init driver static int init(sh_video_t *sh){ HRESULT ret; diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index b97845d14d..868fb6a385 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -74,9 +74,9 @@ static BITMAPINFOHEADER* vfw_open_encoder(char *dll_name, BITMAPINFOHEADER *inpu ICINFO icinfo; ret = ICGetInfo(encoder_hic, &icinfo, sizeof(ICINFO)); - printf("%d - %d - %d\n", ret, icinfo.dwSize, sizeof(ICINFO)); -printf("Compressor type: %.4x\n", icinfo.fccType); -printf("Compressor subtype: %.4x\n", icinfo.fccHandler); + printf("%ld - %ld - %d\n", ret, icinfo.dwSize, sizeof(ICINFO)); +printf("Compressor type: %.4lx\n", icinfo.fccType); +printf("Compressor subtype: %.4lx\n", icinfo.fccHandler); printf("Compressor flags: %lu, version %lu, ICM version: %lu\n", icinfo.dwFlags, icinfo.dwVersion, icinfo.dwVersionICM); //printf("Compressor name: %s\n", icinfo.szName); @@ -130,21 +130,21 @@ static int vfw_start_encoder(BITMAPINFOHEADER *input_bih, BITMAPINFOHEADER *outp // if(verbose) { printf("Starting compression:\n"); printf(" Input format:\n"); - printf(" biSize %ld\n", input_bih->biSize); - printf(" biWidth %ld\n", input_bih->biWidth); - printf(" biHeight %ld\n", input_bih->biHeight); + printf(" biSize %d\n", input_bih->biSize); + printf(" biWidth %d\n", input_bih->biWidth); + printf(" biHeight %d\n", input_bih->biHeight); printf(" biPlanes %d\n", input_bih->biPlanes); printf(" biBitCount %d\n", input_bih->biBitCount); - printf(" biCompression 0x%lx ('%.4s')\n", input_bih->biCompression, (char *)&input_bih->biCompression); - printf(" biSizeImage %ld\n", input_bih->biSizeImage); + printf(" biCompression 0x%x ('%.4s')\n", input_bih->biCompression, (char *)&input_bih->biCompression); + printf(" biSizeImage %d\n", input_bih->biSizeImage); printf(" Output format:\n"); - printf(" biSize %ld\n", output_bih->biSize); - printf(" biWidth %ld\n", output_bih->biWidth); - printf(" biHeight %ld\n", output_bih->biHeight); + printf(" biSize %d\n", output_bih->biSize); + printf(" biWidth %d\n", output_bih->biWidth); + printf(" biHeight %d\n", output_bih->biHeight); printf(" biPlanes %d\n", output_bih->biPlanes); printf(" biBitCount %d\n", output_bih->biBitCount); - printf(" biCompression 0x%lx ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression); - printf(" biSizeImage %ld\n", output_bih->biSizeImage); + printf(" biCompression 0x%x ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression); + printf(" biSizeImage %d\n", output_bih->biSizeImage); // } output_bih->biWidth=input_bih->biWidth; @@ -165,13 +165,13 @@ static int vfw_start_encoder(BITMAPINFOHEADER *input_bih, BITMAPINFOHEADER *outp mp_msg(MSGT_WIN32,MSGL_V,"ICCompressBegin OK\n"); printf(" Output format after query/begin:\n"); - printf(" biSize %ld\n", output_bih->biSize); - printf(" biWidth %ld\n", output_bih->biWidth); - printf(" biHeight %ld\n", output_bih->biHeight); + printf(" biSize %d\n", output_bih->biSize); + printf(" biWidth %d\n", output_bih->biWidth); + printf(" biHeight %d\n", output_bih->biHeight); printf(" biPlanes %d\n", output_bih->biPlanes); printf(" biBitCount %d\n", output_bih->biBitCount); - printf(" biCompression 0x%lx ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression); - printf(" biSizeImage %ld\n", output_bih->biSizeImage); + printf(" biCompression 0x%x ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression); + printf(" biSizeImage %d\n", output_bih->biSizeImage); encoder_buf_size=input_bih->biSizeImage; encoder_buf=malloc(encoder_buf_size); diff --git a/libmpcodecs/ve_xvid.c b/libmpcodecs/ve_xvid.c index 8ffd8baf75..d3dde28039 100644 --- a/libmpcodecs/ve_xvid.c +++ b/libmpcodecs/ve_xvid.c @@ -50,6 +50,7 @@ static int const divx4_general_presets[7] = { }; extern char* passtmpfile; +extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); static int xvidenc_pass = 0; static int xvidenc_quality = sizeof(divx4_motion_presets) / sizeof(divx4_motion_presets[0]) - 1; /* best quality */ @@ -136,7 +137,10 @@ config(struct vf_instance_s* vf, enc_param.rc_buffer = xvidenc_rc_buffer; enc_param.min_quantizer = xvidenc_min_quantizer; enc_param.max_quantizer = xvidenc_max_quantizer; - enc_param.max_key_interval = xvidenc_max_key_interval; + if( xvidenc_max_key_interval > 0 ) + enc_param.max_key_interval = xvidenc_max_key_interval; + else + enc_param.max_key_interval = 10 * enc_param.fbase / enc_param.fincr; switch (xvid_encore(NULL, XVID_ENC_CREATE, &enc_param, NULL)) { case XVID_ERR_FAIL: mp_msg(MSGT_MENCODER,MSGL_ERR, "xvid: encoder creation failed\n"); diff --git a/libmpcodecs/vf_1bpp.c b/libmpcodecs/vf_1bpp.c index b5bbd32889..2d6a959dc9 100644 --- a/libmpcodecs/vf_1bpp.c +++ b/libmpcodecs/vf_1bpp.c @@ -165,7 +165,6 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ } static int open(vf_instance_t *vf, char* args){ - unsigned int i; vf->config=config; vf->put_image=put_image; vf->query_format=query_format; diff --git a/libmpcodecs/vf_2xsai.c b/libmpcodecs/vf_2xsai.c index 243290f4b5..20db798722 100644 --- a/libmpcodecs/vf_2xsai.c +++ b/libmpcodecs/vf_2xsai.c @@ -130,7 +130,6 @@ void Super2xSaI_ex(uint8 *src, uint32 src_pitch, uint8 *dst, uint32 dst_pitch, uint32 width, uint32 height, int sbpp) { - int j; unsigned int x, y; unsigned long color[16]; diff --git a/libmpcodecs/vf_boxblur.c b/libmpcodecs/vf_boxblur.c index 2ce971a62a..a5e7f9767a 100644 --- a/libmpcodecs/vf_boxblur.c +++ b/libmpcodecs/vf_boxblur.c @@ -177,7 +177,6 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ } static int open(vf_instance_t *vf, char* args){ - char *pos, *max; int e; vf->config=config; diff --git a/libmpcodecs/vf_il.c b/libmpcodecs/vf_il.c index 0f7e3e6625..d4e9a840db 100644 --- a/libmpcodecs/vf_il.c +++ b/libmpcodecs/vf_il.c @@ -49,7 +49,7 @@ struct vf_priv_s { /***************************************************************************/ -static int interleave(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int interleave, int swap){ +static void interleave(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int interleave, int swap){ const int a= swap; const int b= 1-a; const int m= h>>1; @@ -124,7 +124,6 @@ static void parse(FilterParam *fp, char* args){ } static int open(vf_instance_t *vf, char* args){ - char *pos, *max; vf->put_image=put_image; // vf->get_image=get_image; diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index a09b89440f..c82ece5798 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -8,6 +8,10 @@ #include "../mp_msg.h" #include "../cpudetect.h" +#ifdef HAVE_MALLOC_H +#include <malloc.h> +#endif + #include "img_format.h" #include "mp_image.h" #include "vf.h" 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* dem |