diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-30 17:38:09 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-30 17:38:09 +0000 |
commit | 734198df1942bc85fffdb046bcf109d9687faeeb (patch) | |
tree | efd29bfcb3210bc5e6a086ef0f96344a9b38bcdc /dec_video.c | |
parent | 704ca0fcef86e8b4199df8441dba9c000b3a8cdb (diff) | |
download | mpv-734198df1942bc85fffdb046bcf109d9687faeeb.tar.bz2 mpv-734198df1942bc85fffdb046bcf109d9687faeeb.tar.xz |
more cleanup, warnings fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2564 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dec_video.c')
-rw-r--r-- | dec_video.c | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/dec_video.c b/dec_video.c index 4b720b5cb9..1a7d1a599a 100644 --- a/dec_video.c +++ b/dec_video.c @@ -1,6 +1,4 @@ -#define USE_XANIM - #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -9,17 +7,11 @@ #include "mp_msg.h" #include "help_mp.h" -extern int verbose; // defined in mplayer.c -extern int divx_quality; - -extern double video_time_usage; -extern double vout_time_usage; - -extern int frameratecode2framerate[16]; - #include "linux/timer.h" #include "linux/shmem.h" +extern int verbose; // defined in mplayer.c + #include "stream.h" #include "demuxer.h" #include "parse_es.h" @@ -27,17 +19,26 @@ extern int frameratecode2framerate[16]; #include "codec-cfg.h" #include "stheader.h" -#include "dll_init.h" - -//#include <inttypes.h> -//#include "libvo/img_format.h" - #ifdef USE_LIBVO2 #include "libvo2/libvo2.h" #else #include "libvo/video_out.h" #endif +#include "dec_video.h" + +// =================================================================== + +extern double video_time_usage; +extern double vout_time_usage; + +extern int frameratecode2framerate[16]; + +#include "dll_init.h" + +//#include <inttypes.h> +//#include "libvo/img_format.h" + #include "libmpeg2/mpeg2.h" #include "libmpeg2/mpeg2_internal.h" @@ -45,6 +46,7 @@ extern int frameratecode2framerate[16]; extern picture_t *picture; // exported from libmpeg2/decode.c +int divx_quality=0; #ifdef USE_DIRECTSHOW #include "loader/DirectShow/DS_VideoDec.h" @@ -71,6 +73,8 @@ extern picture_t *picture; // exported from libmpeg2/decode.c #include <decore.h> #endif +#define USE_XANIM + #ifdef USE_XANIM #include "xacodec.h" #endif @@ -224,6 +228,11 @@ void uninit_video(sh_video_t *sh_video){ case VFM_MPEG: mpeg2_free_image_buffers (picture); break; +#ifdef USE_XANIM + case VFM_XANIM: + xacodec_exit(); + break; +#endif } if(sh_video->our_out_buffer){ free(sh_video->our_out_buffer); |