diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-07 21:59:49 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-07 21:59:49 +0000 |
| commit | 623d9de4aea92ac4a77bda751fe0878e3ca8d6cd (patch) | |
| tree | bea0bc524a818d2ea3d6dcabb706df272db48e56 | |
| parent | 86be1009c3a96e7c69f329090aac22f7fd1ca7fd (diff) | |
| download | mpv-623d9de4aea92ac4a77bda751fe0878e3ca8d6cd.tar.bz2 mpv-623d9de4aea92ac4a77bda751fe0878e3ca8d6cd.tar.xz | |
.mov support can be disabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2128 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | demux_mov.c | 10 | ||||
| -rw-r--r-- | demuxer.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/demux_mov.c b/demux_mov.c index 39a6e9954b..3c5e0282cf 100644 --- a/demux_mov.c +++ b/demux_mov.c @@ -440,12 +440,12 @@ int mov_read_header(demuxer_t* demuxer){ if(!stream_seek(demuxer->stream,priv->moov_start)) return 0; // ??? lschunks(demuxer, 0, priv->moov_end, NULL); - // Build tables: - // ... - - mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_MOVnotyetsupp); - +#if 1 return 1; +#else + mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_MOVnotyetsupp); + return 0; +#endif } // return value: @@ -455,9 +455,9 @@ 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; + if(!mov_read_header(demuxer)) return NULL; +// 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: { |