summaryrefslogtreecommitdiffstats
path: root/demuxer.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-12 01:58:05 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-12 01:58:05 +0000
commit5cbfd1065e5ffa0dc73bb9df17e1cdfc34fb3474 (patch)
tree30eb2cb0e930346b2ec55ecf3a2e8b742e02e02e /demuxer.c
parent194792ed8ef74edfd306de138170862e4c274057 (diff)
downloadmpv-5cbfd1065e5ffa0dc73bb9df17e1cdfc34fb3474.tar.bz2
mpv-5cbfd1065e5ffa0dc73bb9df17e1cdfc34fb3474.tar.xz
MOV file support - not works yet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1491 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'demuxer.c')
-rw-r--r--demuxer.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/demuxer.c b/demuxer.c
index 7e5e83e6f1..bfaa530eba 100644
--- a/demuxer.c
+++ b/demuxer.c
@@ -391,11 +391,11 @@ if(file_format==DEMUXER_TYPE_MPEG_ES){ // little hack, see above!
}
}
//=============== Try to open as MOV file: =================
-#if 0
+#if 1
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){
stream_reset(stream);
demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id);
-// stream_seek(demuxer->stream,seek_to_byte);
+ stream_seek(demuxer->stream,seek_to_byte);
if(mov_check_file(demuxer)){
printf("Detected QuickTime/MOV file format!\n");
file_format=DEMUXER_TYPE_MOV;
@@ -418,6 +418,10 @@ d_video=demuxer->video;
demuxer->file_format=file_format;
switch(file_format){
+ case DEMUXER_TYPE_MOV: {
+ mov_read_header(demuxer);
+ break;
+ }
case DEMUXER_TYPE_AVI: {
return demux_open_avi(demuxer);
// break;