diff options
| author | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-05 23:46:08 +0000 |
|---|---|---|
| committer | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-05 23:46:08 +0000 |
| commit | 45defa1aa0bb0b7168702023baec6edd77c0a364 (patch) | |
| tree | e6d889b3612bb9fa37cdcd81adbf8dc8296617ee /libmpdemux | |
| parent | ca7997a50cf06885a54f4d548696f10188576e43 (diff) | |
| download | mpv-45defa1aa0bb0b7168702023baec6edd77c0a364.tar.bz2 mpv-45defa1aa0bb0b7168702023baec6edd77c0a364.tar.xz | |
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
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demuxer.c | 1 | ||||
| -rw-r--r-- | libmpdemux/muxer_mpeg.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 746452f5b2..f41a8b4ffc 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -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 diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 35d32900ab..c3978128f3 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -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)); |