Mercurial > mplayer.hg
changeset 2106:0ad08f8e49b9
ehh. 10l. required for MOV
| author | arpi |
|---|---|
| date | Sat, 06 Oct 2001 11:29:18 +0000 |
| parents | 4a45aca2c46d |
| children | 373d52e3bed6 |
| files | demuxer.c |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/demuxer.c Sat Oct 06 10:50:46 2001 +0000 +++ b/demuxer.c Sat Oct 06 11:29:18 2001 +0000 @@ -159,6 +159,7 @@ 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 @@ 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 @@ 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: {