Mercurial > mplayer.hg

comparison libmpdemux/demux_mov.c @ 21353:a965ca17debc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
author nplourde
date Tue, 28 Nov 2006 23:13:08 +0000
parents ddc587b1fd8b
children 072d3248d309
comparison
equal deleted inserted replaced
21352:2d786b7625d7 21353:a965ca17debc
20 20
21 #include <stdio.h> 21 #include <stdio.h>
22 #include <stdlib.h> 22 #include <stdlib.h>
23 #include <unistd.h> 23 #include <unistd.h>
24 24
25 #include "config.h"
26 #include "mp_msg.h"
27 #include "help_mp.h"
28
29 #include "stream.h"
30 #include "demuxer.h"
31 #include "stheader.h"
32
33 #include "bswap.h"
34
35 #include "libvo/sub.h"
36 extern subtitle *vo_sub;
37
38 #include "qtpalette.h"
39 #include "parse_mp4.h" // .MP4 specific stuff
40
41 #ifdef MACOSX 25 #ifdef MACOSX
42 #include <QuickTime/QuickTime.h> 26 #include <QuickTime/QuickTime.h>
43 #include <QuickTime/ImageCompression.h> 27 #include <QuickTime/ImageCompression.h>
44 #include <QuickTime/ImageCodec.h> 28 #include <QuickTime/ImageCodec.h>
45 #else 29 #else
46 #include "loader/qtx/qtxsdk/components.h" 30 #include "loader/qtx/qtxsdk/components.h"
47 #endif 31 #endif
32
33 #include "config.h"
34 #include "mp_msg.h"
35 #include "help_mp.h"
36
37 #include "stream.h"
38 #include "demuxer.h"
39 #include "stheader.h"
40
41 #include "bswap.h"
42
43 #include "libvo/sub.h"
44 extern subtitle *vo_sub;
45
46 #include "qtpalette.h"
47 #include "parse_mp4.h" // .MP4 specific stuff
48 48
49 #ifdef HAVE_ZLIB 49 #ifdef HAVE_ZLIB
50 #include <zlib.h> 50 #include <zlib.h>
51 #endif 51 #endif
52 52