Mercurial > mplayer.hg
comparison dec_video.c @ 2563:fc124f9db88e
more cleanup, warnings fixed
author | arpi |
---|---|
date | Tue, 30 Oct 2001 17:38:09 +0000 |
parents | 88195a28576a |
children | ea6158be8103 |
comparison
equal
deleted
inserted
replaced
2562:4b0db52f5de9 | 2563:fc124f9db88e |
---|---|
1 | |
2 #define USE_XANIM | |
3 | 1 |
4 #include <stdio.h> | 2 #include <stdio.h> |
5 #include <stdlib.h> | 3 #include <stdlib.h> |
6 #include <unistd.h> | 4 #include <unistd.h> |
7 | 5 |
8 #include "config.h" | 6 #include "config.h" |
9 #include "mp_msg.h" | 7 #include "mp_msg.h" |
10 #include "help_mp.h" | 8 #include "help_mp.h" |
11 | 9 |
12 extern int verbose; // defined in mplayer.c | |
13 extern int divx_quality; | |
14 | |
15 extern double video_time_usage; | |
16 extern double vout_time_usage; | |
17 | |
18 extern int frameratecode2framerate[16]; | |
19 | |
20 #include "linux/timer.h" | 10 #include "linux/timer.h" |
21 #include "linux/shmem.h" | 11 #include "linux/shmem.h" |
12 | |
13 extern int verbose; // defined in mplayer.c | |
22 | 14 |
23 #include "stream.h" | 15 #include "stream.h" |
24 #include "demuxer.h" | 16 #include "demuxer.h" |
25 #include "parse_es.h" | 17 #include "parse_es.h" |
26 | 18 |
27 #include "codec-cfg.h" | 19 #include "codec-cfg.h" |
28 #include "stheader.h" | 20 #include "stheader.h" |
29 | 21 |
22 #ifdef USE_LIBVO2 | |
23 #include "libvo2/libvo2.h" | |
24 #else | |
25 #include "libvo/video_out.h" | |
26 #endif | |
27 | |
28 #include "dec_video.h" | |
29 | |
30 // =================================================================== | |
31 | |
32 extern double video_time_usage; | |
33 extern double vout_time_usage; | |
34 | |
35 extern int frameratecode2framerate[16]; | |
36 | |
30 #include "dll_init.h" | 37 #include "dll_init.h" |
31 | 38 |
32 //#include <inttypes.h> | 39 //#include <inttypes.h> |
33 //#include "libvo/img_format.h" | 40 //#include "libvo/img_format.h" |
34 | 41 |
35 #ifdef USE_LIBVO2 | |
36 #include "libvo2/libvo2.h" | |
37 #else | |
38 #include "libvo/video_out.h" | |
39 #endif | |
40 | |
41 #include "libmpeg2/mpeg2.h" | 42 #include "libmpeg2/mpeg2.h" |
42 #include "libmpeg2/mpeg2_internal.h" | 43 #include "libmpeg2/mpeg2_internal.h" |
43 | 44 |
44 #include "postproc/postprocess.h" | 45 #include "postproc/postprocess.h" |
45 | 46 |
46 extern picture_t *picture; // exported from libmpeg2/decode.c | 47 extern picture_t *picture; // exported from libmpeg2/decode.c |
47 | 48 |
49 int divx_quality=0; | |
48 | 50 |
49 #ifdef USE_DIRECTSHOW | 51 #ifdef USE_DIRECTSHOW |
50 #include "loader/DirectShow/DS_VideoDec.h" | 52 #include "loader/DirectShow/DS_VideoDec.h" |
51 #endif | 53 #endif |
52 | 54 |
68 #ifndef NEW_DECORE | 70 #ifndef NEW_DECORE |
69 #include "opendivx/decore.h" | 71 #include "opendivx/decore.h" |
70 #else | 72 #else |
71 #include <decore.h> | 73 #include <decore.h> |
72 #endif | 74 #endif |
75 | |
76 #define USE_XANIM | |
73 | 77 |
74 #ifdef USE_XANIM | 78 #ifdef USE_XANIM |
75 #include "xacodec.h" | 79 #include "xacodec.h" |
76 #endif | 80 #endif |
77 | 81 |
222 break; | 226 break; |
223 #endif | 227 #endif |
224 case VFM_MPEG: | 228 case VFM_MPEG: |
225 mpeg2_free_image_buffers (picture); | 229 mpeg2_free_image_buffers (picture); |
226 break; | 230 break; |
231 #ifdef USE_XANIM | |
232 case VFM_XANIM: | |
233 xacodec_exit(); | |
234 break; | |
235 #endif | |
227 } | 236 } |
228 if(sh_video->our_out_buffer){ | 237 if(sh_video->our_out_buffer){ |
229 free(sh_video->our_out_buffer); | 238 free(sh_video->our_out_buffer); |
230 sh_video->our_out_buffer=NULL; | 239 sh_video->our_out_buffer=NULL; |
231 } | 240 } |