diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-22 02:33:28 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-22 02:33:28 +0000 |
| commit | d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb (patch) | |
| tree | 8f1d76f283da6022022a35e300c30faf93e71e83 /libmpdemux/demux_pva.c | |
| parent | 61c5a99851ea41449a513619dd68791c93e30ef3 (diff) | |
| download | mpv-d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb.tar.bz2 mpv-d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb.tar.xz | |
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_pva.c')
| -rw-r--r-- | libmpdemux/demux_pva.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c index e07aac5b59..93865d24bc 100644 --- a/libmpdemux/demux_pva.c +++ b/libmpdemux/demux_pva.c @@ -18,7 +18,9 @@ */ - +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include "config.h" #include "mp_msg.h" @@ -124,9 +126,6 @@ demuxer_t * demux_open_pva (demuxer_t * demuxer) sh_video_t *sh_video = new_sh_video(demuxer,0); sh_audio_t * sh_audio = new_sh_audio(demuxer,0); pva_priv_t * priv; - unsigned char * buffer; - - stream_reset(demuxer->stream); stream_seek(demuxer->stream,0); @@ -172,6 +171,8 @@ demuxer_t * demux_open_pva (demuxer_t * demuxer) return demuxer; } +int pva_get_payload(demuxer_t * d,pva_payload_t * payload); + // 0 = EOF or no stream found // 1 = successfully read a packet int demux_pva_fill_buffer (demuxer_t * demux) @@ -340,7 +341,7 @@ int pva_get_payload(demuxer_t * d,pva_payload_t * payload) if((buffer[0] & 0xf0)!=0x20) { mp_msg(MSGT_DEMUX,MSGL_ERR,"demux_pva: expected audio PTS but badly formatted... (read 0x%02X)\n",buffer[0]); - return; + return 0; } payload->pts=0LL; payload->pts|=((uint64_t)(buffer[0] & 0x0e) << 29); @@ -358,6 +359,7 @@ int pva_get_payload(demuxer_t * d,pva_payload_t * payload) break; } } + return 1; } int demux_seek_pva(demuxer_t * demuxer,float rel_seek_secs,int flags) |