diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
commit | c37f09693d0edb632c80f8f38ecdb2faf3547f7f (patch) | |
tree | 44df07eacb522a97bbecd7a3a0f93e8d6a933003 /libmpdemux/demux_mpg.c | |
parent | 22a06c4ae5672c1dd629918d0a279b8af24e35c3 (diff) | |
parent | 2aafb808284d74edab6e5320e1114f5c74d5881e (diff) | |
download | mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.bz2 mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.xz |
Merge svn changes up to r30643
Diffstat (limited to 'libmpdemux/demux_mpg.c')
-rw-r--r-- | libmpdemux/demux_mpg.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 1e994afa41..227af229f5 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -815,7 +815,8 @@ static int demux_mpg_gxf_fill_buffer(demuxer_t *demux, demux_stream_t *ds) { return 1; } -static int demux_mpg_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ +static int demux_mpg_fill_buffer(demuxer_t *demux, demux_stream_t *ds) +{ unsigned int head=0; int skipped=0; int max_packs=256; // 512kbyte @@ -824,11 +825,9 @@ int ret=0; // System stream do{ demux->filepos=stream_tell(demux->stream); -#if 1 //lame workaround: this is needed to show the progress bar when playing dvdnav:// //(ths poor guy doesn't know teh length of the stream at startup) demux->movi_end = demux->stream->end_pos; -#endif head=stream_read_dword(demux->stream); if((head&0xFFFFFF00)!=0x100){ // sync... @@ -902,7 +901,9 @@ do{ void skip_audio_frame(sh_audio_t *sh_audio); -static void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, int flags){ +static void demux_seek_mpg(demuxer_t *demuxer, float rel_seek_secs, + float audio_delay, int flags) +{ demux_stream_t *d_audio=demuxer->audio; demux_stream_t *d_video=demuxer->video; sh_audio_t *sh_audio=d_audio->sh; @@ -1008,7 +1009,8 @@ static void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_de } } -static int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){ +static int demux_mpg_control(demuxer_t *demuxer, int cmd, void *arg) +{ mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv; switch(cmd) { |