mirror of
https://github.com/mpv-player/mpv
synced 2025-02-17 04:58:06 +00:00
Fix a few gcc warnings, approved by Diego and Reimar.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22160 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
ca7997a50c
commit
45defa1aa0
@ -246,8 +246,8 @@ static int get_space(void) {
|
||||
|
||||
/** Return the current latency in seconds */
|
||||
static float get_delay(void) {
|
||||
assert(stream && context && pa_stream_get_state(stream) == PA_STREAM_READY);
|
||||
pa_usec_t latency;
|
||||
assert(stream && context && pa_stream_get_state(stream) == PA_STREAM_READY);
|
||||
|
||||
/* latency = 0; */
|
||||
/* wait_for_operation(pa_stream_get_latency(stream, latency_func, NULL)); */
|
||||
|
@ -22,6 +22,7 @@
|
||||
|
||||
#include "libaf/af_format.h"
|
||||
|
||||
extern void resync_video_stream(sh_video_t *sh_video);
|
||||
extern void resync_audio_stream(sh_audio_t *sh_audio);
|
||||
|
||||
// Demuxer list
|
||||
|
@ -872,7 +872,7 @@ static int write_mpeg_pack(muxer_t *muxer, muxer_stream_t *s, stream_t *stream,
|
||||
}
|
||||
}
|
||||
|
||||
static int update_demux_bufsize(muxer_headers_t *spriv, uint64_t dts, int framelen, int type)
|
||||
static void update_demux_bufsize(muxer_headers_t *spriv, uint64_t dts, int framelen, int type)
|
||||
{
|
||||
int dim = (spriv->track_len+16)*sizeof(buffer_track_t);
|
||||
|
||||
@ -882,7 +882,7 @@ static int update_demux_bufsize(muxer_headers_t *spriv, uint64_t dts, int framel
|
||||
if(!tmp)
|
||||
{
|
||||
mp_msg(MSGT_MUXER, MSGL_ERR, "\r\nERROR, couldn't realloc %d bytes for tracking buffer\r\n", dim);
|
||||
return 0;
|
||||
return;
|
||||
}
|
||||
spriv->buffer_track = tmp;
|
||||
memset(&(spriv->buffer_track[spriv->track_pos+1]), 0, 16*sizeof(buffer_track_t));
|
||||
|
@ -2,6 +2,7 @@
|
||||
#include "fastmemcpy.h"
|
||||
#include "cpudetect.h"
|
||||
#include "libswscale/swscale.h"
|
||||
#include "libswscale/rgb2rgb.h"
|
||||
#include "libmpcodecs/vf_scale.h"
|
||||
#include "mp_msg.h"
|
||||
#include "help_mp.h"
|
||||
|
@ -28,12 +28,11 @@ static DWORD WINAPI ThreadProc(void* s);
|
||||
#include "help_mp.h"
|
||||
|
||||
#include "stream.h"
|
||||
#include "input/input.h"
|
||||
|
||||
int stream_fill_buffer(stream_t *s);
|
||||
int stream_seek_long(stream_t *s,off_t pos);
|
||||
|
||||
extern int mp_input_check_interrupt(int time);
|
||||
|
||||
typedef struct {
|
||||
// constats:
|
||||
unsigned char *buffer; // base pointer of the alllocated buffer memory
|
||||
|
@ -40,8 +40,6 @@
|
||||
|
||||
extern int stream_cache_size;
|
||||
|
||||
extern int mp_input_check_interrupt(int time);
|
||||
|
||||
/* Variables for the command line option -user, -passwd, -bandwidth,
|
||||
-user-agent and -nocookies */
|
||||
|
||||
|
@ -19,6 +19,7 @@
|
||||
|
||||
#include "mp_msg.h"
|
||||
#include "help_mp.h"
|
||||
#include "input/input.h"
|
||||
|
||||
#ifndef HAVE_WINSOCK2
|
||||
#include <netdb.h>
|
||||
|
Loading…
Reference in New Issue
Block a user