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_avi.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_avi.c')
| -rw-r--r-- | libmpdemux/demux_avi.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index e554606d14..a104be57bc 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -30,12 +30,9 @@ #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" - +#include "demux_ogg.h" #include "aviheader.h" -demuxer_t* init_avi_with_ogg(demuxer_t* demuxer); -int demux_ogg_open(demuxer_t* demuxer); - extern const demuxer_desc_t demuxer_desc_avi_ni; extern const demuxer_desc_t demuxer_desc_avi_nini; @@ -43,7 +40,7 @@ extern const demuxer_desc_t demuxer_desc_avi_nini; int pts_from_bps=1; // Select ds from ID -static demux_stream_t* demux_avi_select_stream(demuxer_t *demux, +static demux_stream_t *demux_avi_select_stream(demuxer_t *demux, unsigned int id) { int stream_id=avi_stream_id(id); @@ -308,7 +305,8 @@ do{ // return value: // 0 = EOF or no stream found // 1 = successfully read a packet -static int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t* ds){ +static int demux_avi_fill_buffer_ni(demuxer_t *demux, demux_stream_t *ds) +{ avi_priv_t *priv=demux->priv; unsigned int id=0; unsigned int len; @@ -376,7 +374,8 @@ do{ // return value: // 0 = EOF or no stream found // 1 = successfully read a packet -static int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t* ds){ +static int demux_avi_fill_buffer_nini(demuxer_t *demux, demux_stream_t *ds) +{ avi_priv_t *priv=demux->priv; unsigned int id=0; unsigned int len; @@ -432,8 +431,6 @@ int index_mode=-1; // -1=untouched 0=don't use index 1=use (generate) index char *index_file_save = NULL, *index_file_load = NULL; int force_ni=0; // force non-interleaved AVI parsing -void read_avi_header(demuxer_t *demuxer,int index_mode); - static demuxer_t* demux_open_avi(demuxer_t* demuxer){ demux_stream_t *d_audio=demuxer->audio; demux_stream_t *d_video=demuxer->video; @@ -592,7 +589,9 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){ } -static void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ +static void demux_seek_avi(demuxer_t *demuxer, float rel_seek_secs, + float audio_delay, int flags) +{ avi_priv_t *priv=demuxer->priv; demux_stream_t *d_audio=demuxer->audio; demux_stream_t *d_video=demuxer->video; @@ -765,7 +764,8 @@ static void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,float audio_de } -static void demux_close_avi(demuxer_t *demuxer) { +static void demux_close_avi(demuxer_t *demuxer) +{ avi_priv_t* priv=demuxer->priv; if(!priv) |