diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-06 11:29:18 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-06 11:29:18 +0000 |
| commit | e7c5277dc44acab01c981ef5ccaf0c11827b5426 (patch) | |
| tree | 8b64700cca0075a94d88015d63ea075c910a4ea4 /demuxer.c | |
| parent | b1959ec3c277db6b6e2635ad620534d440b7d3fa (diff) | |
| download | mpv-e7c5277dc44acab01c981ef5ccaf0c11827b5426.tar.bz2 mpv-e7c5277dc44acab01c981ef5ccaf0c11827b5426.tar.xz | |
ehh. 10l. required for MOV
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2107 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'demuxer.c')
| -rw-r--r-- | demuxer.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -159,6 +159,7 @@ int demux_avi_fill_buffer(demuxer_t *demux); int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t *ds); int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t *ds); int demux_asf_fill_buffer(demuxer_t *demux); +int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds); int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ // Note: parameter 'ds' can be NULL! @@ -170,6 +171,7 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ case DEMUXER_TYPE_AVI_NI: return demux_avi_fill_buffer_ni(demux,ds); case DEMUXER_TYPE_AVI_NINI: return demux_avi_fill_buffer_nini(demux,ds); case DEMUXER_TYPE_ASF: return demux_asf_fill_buffer(demux); + case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds); } return 0; } @@ -454,6 +456,8 @@ demuxer->file_format=file_format; switch(file_format){ case DEMUXER_TYPE_MOV: { mov_read_header(demuxer); + sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video; + sh_audio=d_audio->sh;if(sh_audio) sh_audio->ds=d_audio; break; } case DEMUXER_TYPE_AVI: { |