github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 04:36:24 +01:00
Code Releases Activity

Make liblzo conditional to the appropriate #defines.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22262 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-02-18 19:28:47 +00:00
parent 7593a4d298
commit c9232c4a62
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cfg-mencoder.h
View File

@ -46,7 +46,10 @@ extern m_option_t xvidencopts_conf[];
extern void x264enc_set_param(m_option_t* opt, char* arg); extern void x264enc_set_param(m_option_t* opt, char* arg);
#endif #endif
#ifdef USE_LIBLZO
extern m_option_t nuvopts_conf[]; extern m_option_t nuvopts_conf[];
#endif
extern m_option_t mpegopts_conf[]; extern m_option_t mpegopts_conf[];
#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
extern m_option_t lavfopts_conf[]; extern m_option_t lavfopts_conf[];
@ -68,7 +71,9 @@ m_option_t ovc_conf[]={
" copy - frame copy, without re-encoding. Doesn't work with filters.\n" " copy - frame copy, without re-encoding. Doesn't work with filters.\n"
" frameno - special audio-only file for 3-pass encoding, see DOCS.\n" " frameno - special audio-only file for 3-pass encoding, see DOCS.\n"
" raw - uncompressed video. Use fourcc option to set format explicitly.\n" " raw - uncompressed video. Use fourcc option to set format explicitly.\n"
#ifdef USE_LIBLZO
" nuv - nuppel video\n" " nuv - nuppel video\n"
#endif
#ifdef USE_LIBAVCODEC #ifdef USE_LIBAVCODEC
" lavc - libavcodec codecs - best quality!\n" " lavc - libavcodec codecs - best quality!\n"
#endif #endif
@ -274,7 +279,9 @@ m_option_t mencoder_opts[]={
{"x264encopts", &x264enc_set_param, CONF_TYPE_FUNC_PARAM, CONF_GLOBAL, 0, 0, NULL}, {"x264encopts", &x264enc_set_param, CONF_TYPE_FUNC_PARAM, CONF_GLOBAL, 0, 0, NULL},
#endif #endif
#ifdef USE_LIBLZO
{"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, {"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
#endif
{"mpegopts", mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, {"mpegopts", mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
{"lavfopts", lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, {"lavfopts", lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},

2
libmpcodecs/Makefile
View File

@ -134,12 +134,12 @@ SRCS-$(ZORAN) += vd_zrmjpeg.c vf_zrmjpeg.c
SRCS2=ae.c \ SRCS2=ae.c \
ae_pcm.c \ ae_pcm.c \
ve.c \ ve.c \
ve_nuv.c \
ve_raw.c \ ve_raw.c \
SRCS2-$(CONFIG_LIBAVCODEC) += ae_lavc.c ve_lavc.c SRCS2-$(CONFIG_LIBAVCODEC) += ae_lavc.c ve_lavc.c
SRCS2-$(CONFIG_LIBAVCODEC_SO) += ae_lavc.c ve_lavc.c SRCS2-$(CONFIG_LIBAVCODEC_SO) += ae_lavc.c ve_lavc.c
SRCS2-$(LIBDV) += ve_libdv.c SRCS2-$(LIBDV) += ve_libdv.c
SRCS2-$(LIBLZO) += ve_nuv.c
SRCS2-$(QTX_CODECS) += ve_qtvideo.c SRCS2-$(QTX_CODECS) += ve_qtvideo.c
SRCS2-$(WIN32DLL) += ve_vfw.c SRCS2-$(WIN32DLL) += ve_vfw.c
SRCS2-$(X264) += ve_x264.c SRCS2-$(X264) += ve_x264.c

2
libmpcodecs/ve.c
View File

@ -35,7 +35,9 @@ static vf_info_t* encoder_list[]={
#ifdef HAVE_XVID4 #ifdef HAVE_XVID4
&ve_info_xvid, &ve_info_xvid,
#endif #endif
#ifdef USE_LIBLZO
&ve_info_nuv, &ve_info_nuv,
#endif
#ifdef HAVE_X264 #ifdef HAVE_X264
&ve_info_x264, &ve_info_x264,
#endif #endif