diff options
author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-11-03 06:24:59 +0000 |
---|---|---|
committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-11-03 06:24:59 +0000 |
commit | bb032bfb6ab743278a41322f07a9276e67ff7632 (patch) | |
tree | 6fa69f4bc07c76384083d70c575c8416070522b4 /libmpdemux/demux_mov.c | |
parent | 0ab6710b79d3e2e1f8fe34ab08da78188e70be6a (diff) | |
download | mpv-bb032bfb6ab743278a41322f07a9276e67ff7632.tar.bz2 mpv-bb032bfb6ab743278a41322f07a9276e67ff7632.tar.xz |
1000000l!!!!
of course ffmpeg svq3 decoder will crash if you don't give it the ImageDesc!
now it works fine
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11371 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mov.c')
-rw-r--r-- | libmpdemux/demux_mov.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index cd3513a976..60a2161d16 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -32,9 +32,7 @@ #include "qtpalette.h" #include "parse_mp4.h" // .MP4 specific stuff -#ifdef USE_QTX_CODECS #include "../loader/qtx/qtxsdk/components.h" -#endif #ifdef MACOSX #include <QuickTime/QuickTime.h> @@ -1005,7 +1003,6 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak // 82 char[4] atom type // 86 ... atom data -#if defined(USE_QTX_CODECS) || defined(MACOSX) { ImageDescription* id=malloc(8+trak->stdata_len); trak->desc=id; id->idSize=8+trak->stdata_len; @@ -1034,7 +1031,6 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak } #endif } -#endif if(trak->stdata_len >= 86) { // extra atoms found int pos=78; |