diff options
42 files changed, 6 insertions, 16613 deletions
@@ -642,51 +642,18 @@ SRCS_MPLAYER = command.c \ libvo/vo_null.c \ $(SRCS_MPLAYER-yes) - -SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c -SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c -SRCS_MENCODER-$(LIBAVFORMAT) += libmpdemux/muxer_lavf.c -SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c -SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c \ - libmpcodecs/native/rtjpegn.c -SRCS_MENCODER-$(MP3LAME) += libmpcodecs/ae_lame.c -SRCS_MENCODER-$(QTX_CODECS_WIN32) += libmpcodecs/ve_qtvideo.c -SRCS_MENCODER-$(TOOLAME) += libmpcodecs/ae_toolame.c -SRCS_MENCODER-$(TWOLAME) += libmpcodecs/ae_twolame.c -SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c -SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c -SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c - -SRCS_MENCODER = mencoder.c \ - parser-mecmd.c \ - xvid_vbr.c \ - libmpcodecs/ae.c \ - libmpcodecs/ae_pcm.c \ - libmpcodecs/ve.c \ - libmpcodecs/ve_raw.c \ - libmpdemux/muxer.c \ - libmpdemux/muxer_avi.c \ - libmpdemux/muxer_mpeg.c \ - libmpdemux/muxer_rawaudio.c \ - libmpdemux/muxer_rawvideo.c \ - $(SRCS_MENCODER-yes) - COMMON_LIBS += $(COMMON_LIBS-yes) OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON))) -OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER))) OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER))) OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o OBJS_MPLAYER += $(OBJS_MPLAYER-yes) -MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS) MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) -DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) +DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d)))) ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) -ALL_PRG-$(MENCODER) += mencoder$(EXESUF) -INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man INSTALL_TARGETS-$(MPLAYER) += install-mplayer \ install-mplayer-man \ install-mplayer-msg @@ -754,11 +721,9 @@ all: $(ALL_PRG-yes) locales %-rc.o: %.rc $(WINDRES) -I. $< $@ -mencoder$(EXESUF): $(MENCODER_DEPS) -mencoder$(EXESUF): EXTRALIBS += $(EXTRALIBS_MENCODER) mplayer$(EXESUF): $(MPLAYER_DEPS) mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER) -mencoder$(EXESUF) mplayer$(EXESUF): +mplayer$(EXESUF): $(CC) -o $@ $^ $(EXTRALIBS) codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h @@ -848,29 +813,19 @@ install-dirs: install-%: %$(EXESUF) install-dirs $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) -install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang)) install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang)) install-mplayer-msg: $(foreach lang,$(MSG_LANGS),install-mplayer-msg-$(lang)) -install-mencoder-man-en: install-mplayer-man-en - cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 - install-mplayer-man-en: if test ! -d $(MANDIR)/man1 ; then $(INSTALL) -d $(MANDIR)/man1 ; fi $(INSTALL) -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ -define MENCODER_MAN_RULE -install-mencoder-man-$(lang): install-mplayer-man-$(lang) - cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1 -endef - define MPLAYER_MAN_RULE install-mplayer-man-$(lang): if test ! -d $(MANDIR)/$(lang)/man1 ; then $(INSTALL) -d $(MANDIR)/$(lang)/man1 ; fi $(INSTALL) -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/ endef -$(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MENCODER_MAN_RULE))) $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_MAN_RULE))) define MPLAYER_MSG_RULE @@ -883,17 +838,15 @@ $(foreach lang,$(MSG_LANG_ALL),$(eval $(MPLAYER_MSG_RULE))) uninstall: rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) - rm -f $(BINDIR)/mencoder$(EXESUF) - rm -f $(MANDIR)/man1/mencoder.1 $(MANDIR)/man1/mplayer.1 rm -f $(prefix)/share/pixmaps/mplayer.xpm rm -f $(prefix)/share/applications/mplayer.desktop - rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 - rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) + rm -f $(MANDIR)/man1/mplayer.1 + rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1,$(MANDIR)/$(lang)/man1/$(man))) rm -f $(foreach lang,$(MSG_LANGS),$(LOCALEDIR)/$(lang)/LC_MESSAGES/mplayer.1) clean: -rm -f $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~) - -rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder) + -rm -f $(call ADD_ALL_EXESUFS,mplayer) distclean: clean testsclean toolsclean driversclean dhahelperclean dhahelperwinclean -rm -rf DOCS/tech/doxygen diff --git a/cfg-mencoder.h b/cfg-mencoder.h deleted file mode 100644 index 02473ef00b..0000000000 --- a/cfg-mencoder.h +++ /dev/null @@ -1,278 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_CFG_MENCODER_H -#define MPLAYER_CFG_MENCODER_H - -/* - * config for cfgparser - */ - -#include "libmpcodecs/ve_x264.h" -#include "cfg-common.h" - -extern const m_option_t faacopts_conf[]; -extern const m_option_t lameopts_conf[]; -extern const m_option_t lavcopts_conf[]; -extern const m_option_t lavfopts_conf[]; -extern const m_option_t mpegopts_conf[]; -extern const m_option_t nuvopts_conf[]; -extern const m_option_t toolameopts_conf[]; -extern const m_option_t twolameopts_conf[]; -extern const m_option_t vfwopts_conf[]; -extern const m_option_t xvidencopts_conf[]; - -const m_option_t ovc_conf[]={ - {"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY, NULL}, - {"frameno", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_FRAMENO, NULL}, - {"lavc", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBAVCODEC, NULL}, -// {"null", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NULL, NULL}, - {"raw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAW, NULL}, - {"vfw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_VFW, NULL}, - {"libdv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBDV, NULL}, - {"xvid", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_XVID, NULL}, - {"qtvideo", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_QTVIDEO, NULL}, - {"nuv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NUV, NULL}, - {"x264", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_X264, NULL}, - {"help", "\nAvailable codecs:\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" - " raw - uncompressed video. Use fourcc option to set format explicitly.\n" -#ifdef CONFIG_LIBLZO - " nuv - nuppel video\n" -#endif -#ifdef CONFIG_LIBAVCODEC - " lavc - libavcodec codecs - best quality!\n" -#endif -#ifdef CONFIG_WIN32DLL - " vfw - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n" - " qtvideo - QuickTime DLLs, currently only SVQ1/3 are supported.\n" -#endif -#ifdef CONFIG_LIBDV095 - " libdv - DV encoding with libdv v0.9.5\n" -#endif -#ifdef CONFIG_XVID4 - " xvid - XviD encoding\n" -#endif -#ifdef CONFIG_X264 - " x264 - H.264 encoding\n" -#endif - "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - -const m_option_t oac_conf[]={ - {"copy", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_COPY, NULL}, - {"pcm", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_PCM, NULL}, -#ifdef CONFIG_MP3LAME - {"mp3lame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_VBRMP3, NULL}, -#else - {"mp3lame", "MPlayer was compiled without libmp3lame support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_MP3LAME */ -#ifdef CONFIG_LIBAVCODEC - {"lavc", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_LAVC, NULL}, -#else - {"lavc", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_LIBAVCODEC */ -#ifdef CONFIG_TOOLAME - {"toolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TOOLAME, NULL}, -#else - {"toolame", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_TOOLAME */ -#ifdef CONFIG_TWOLAME - {"twolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TWOLAME, NULL}, -#else - {"twolame", "MPlayer was compiled without libtwolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_TWOLAME */ -#ifdef CONFIG_FAAC - {"faac", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_FAAC, NULL}, -#else - {"faac", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_FAAC */ - {"help", "\nAvailable codecs:\n" - " copy - frame copy, without re-encoding (useful for AC3)\n" - " pcm - uncompressed PCM audio\n" -#ifdef CONFIG_MP3LAME - " mp3lame - cbr/abr/vbr MP3 using libmp3lame\n" -#endif -#ifdef CONFIG_LIBAVCODEC - " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n" -#endif -#ifdef CONFIG_TOOLAME - " toolame - Toolame MP2 audio encoder\n" -#endif -#ifdef CONFIG_TWOLAME - " twolame - Twolame MP2 audio encoder\n" -#endif -#ifdef CONFIG_FAAC - " faac - FAAC AAC audio encoder\n" -#endif - "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - -const m_option_t info_conf[]={ - {"name", &info_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"artist", &info_artist, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"genre", &info_genre, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"subject", &info_subject, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"copyright", &info_copyright, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"srcform", &info_sourceform, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"comment", &info_comment, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"help", "\nAvailable INFO fields:\n" - " name - title of the work\n" - " artist - artist or author of the work\n" - " genre - original work category\n" - " subject - contents of the work\n" - " copyright - copyright information\n" - " srcform - original format of the digitzed material\n" - " comment - general comments about the work\n" - "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - -const m_option_t of_conf[]={ - {"avi", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_AVI, NULL}, - {"mpeg", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_MPEG, NULL}, -#ifdef CONFIG_LIBAVFORMAT - {"lavf", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_LAVF, NULL}, -#endif - {"rawvideo", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_RAWVIDEO, NULL}, - {"rawaudio", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_RAWAUDIO, NULL}, - {"help", "\nAvailable output formats:\n" - " avi - Microsoft Audio/Video Interleaved\n" - " mpeg - MPEG-1/2 system stream format\n" -#ifdef CONFIG_LIBAVFORMAT - " lavf - FFmpeg libavformat muxers\n" -#endif - " rawvideo - (video only, one stream only) raw stream, no muxing\n" - " rawaudio - (audio only, one stream only) raw stream, no muxing\n" - "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - -extern float avi_aspect_override; /* defined in libmpdemux/muxer_avi.c */ -extern int write_odml; /* defined in libmpdemux/muxer_avi.c */ - -const m_option_t mencoder_opts[]={ - /* name, pointer, type, flags, min, max */ - - {"frameno-file", &frameno_filename, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, - - {"hr-edl-seek", &edl_seek_type, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"nohr-edl-seek", &edl_seek_type, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - - // set output framerate - recommended for variable-FPS (ASF etc) files - // and for 29.97FPS progressive MPEG2 streams - {"ofps", &force_ofps, CONF_TYPE_DOUBLE, CONF_MIN|CONF_GLOBAL, 0, 0, NULL}, - {"o", &out_filename, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, - - // limit number of skippable frames after a non-skipped one - {"skiplimit", &skip_limit, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"noskiplimit", &skip_limit, CONF_TYPE_FLAG, 0, 0, -1, NULL}, - {"noskip", &skip_limit, CONF_TYPE_FLAG, 0, 0, 0, NULL}, - - {"audio-density", &audio_density, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 1, 50, NULL}, - {"audio-preload", &audio_preload, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0, 2, NULL}, - {"audio-delay", &audio_delay_fix, CONF_TYPE_FLOAT, CONF_GLOBAL, 0, 0, NULL}, - - {"x", "-x has been removed, use -vf scale=w:h for scaling.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"xsize", "-xsize has been removed, use -vf crop=w:h:x:y for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - - // output audio/video codec selection - {"oac", (void *) oac_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, - {"ovc", (void *) ovc_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, - - // output file format - {"of", (void *) of_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, - - // override audio format tag in output file - {"fafmttag", &force_audiofmttag, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL}, - // override FOURCC in output file - {"ffourcc", &force_fourcc, CONF_TYPE_STRING, CONF_GLOBAL, 4, 4, NULL}, - - // override avi aspect autodetection - {"force-avi-aspect", &avi_aspect_override, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0.2, 3.0, NULL}, - - {"pass", "-pass has been removed, use -lavcopts vpass=n, -xvidencopts pass=n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"passlogfile", &passtmpfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, - - {"vobsubout", &vobsub_out, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, - {"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 31, NULL}, - {"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, - - {"autoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"noautoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - - {"encodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"noencodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - - {"odml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, - {"noodml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, - - // info header strings - {"info", (void *) info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, - -#ifdef CONFIG_MP3LAME - {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#endif -#ifdef CONFIG_LIBAVCODEC - {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#else - {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_LIBAVCODEC */ -#ifdef CONFIG_TOOLAME - {"toolameopts", toolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#else - {"toolameopts", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_TOOLAME */ -#ifdef CONFIG_TWOLAME - {"twolameopts", twolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#else - {"twolameopts", "MPlayer was compiled without libtwolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_TWOLAME */ -#ifdef CONFIG_FAAC - {"faacopts", faacopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#else - {"faacopts", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_FAAC */ -#ifdef CONFIG_WIN32DLL - {"xvfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#endif -#ifdef CONFIG_XVID4 - {"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#endif -#if defined(CONFIG_X264) - {"x264encopts", &x264enc_set_param, CONF_TYPE_FUNC_PARAM, CONF_GLOBAL, 0, 0, NULL}, -#endif - -#ifdef CONFIG_LIBLZO - {"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#endif - {"mpegopts", mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#ifdef CONFIG_LIBAVFORMAT - {"lavfopts", lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#endif - -// {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -// {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -// {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - -#endif /* MPLAYER_CFG_MENCODER_H */ @@ -264,7 +264,6 @@ Installation directories: --codecsdir=DIR directory for binary codecs [LIBDIR/codecs] Optional features: - --disable-mencoder disable MEncoder (A/V encoder) compilation [enable] --disable-mplayer disable MPlayer compilation [enable] --disable-largefiles disable support for files > 2GB [enable] --enable-termcap use termcap database for key codes [autodetect] @@ -501,7 +500,6 @@ Use these options if autodetection fails: --extra-ldflags=FLAGS extra LDFLAGS --extra-libs=FLAGS extra linker flags --extra-libs-mplayer=FLAGS extra linker flags for MPlayer - --extra-libs-mencoder=FLAGS extra linker flags for MEncoder --with-xvmclib=NAME adapter-specific library name (e.g. XvMCNVIDIA) --with-freetype-config=PATH path to freetype-config @@ -559,7 +557,7 @@ _libpostproc=auto _libswscale=auto _libavcodec_internals=no _libswscale_internals=no -_mencoder=yes +_mencoder=no _mplayer=yes _x11=auto _xshape=auto @@ -810,9 +808,6 @@ for ac_option do --extra-libs-mplayer=*) libs_mplayer=$(echo $ac_option | cut -d '=' -f 2) ;; - --extra-libs-mencoder=*) - libs_mencoder=$(echo $ac_option | cut -d '=' -f 2) - ;; --target=*) _target=$(echo $ac_option | cut -d '=' -f 2) @@ -884,8 +879,6 @@ for ac_option do --disable-runtime-cpudetection) _runtime_cpudetection=no ;; --enable-cross-compile) _cross_compile=yes ;; --disable-cross-compile) _cross_compile=no ;; - --enable-mencoder) _mencoder=yes ;; - --disable-mencoder) _mencoder=no ;; --enable-mplayer) _mplayer=yes ;; --disable-mplayer) _mplayer=no ;; --enable-dynamic-plugins) _dynamic_plugins=yes ;; diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c deleted file mode 100644 index 1669359981..0000000000 --- a/libmpcodecs/ae.c +++ /dev/null @@ -1,116 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/types.h> -#include <math.h> -#include "config.h" -#include "libmpdemux/aviheader.h" -#include "libmpdemux/ms_hdr.h" -#include "stream/stream.h" -#include "libmpdemux/muxer.h" -#include "ae.h" - -#include "ae_pcm.h" - -#ifdef CONFIG_TOOLAME -#include "ae_toolame.h" -#endif - -#ifdef CONFIG_MP3LAME -#include "ae_lame.h" -#endif - -#ifdef CONFIG_LIBAVCODEC -#include "ae_lavc.h" -#endif - -#ifdef CONFIG_FAAC -#include "ae_faac.h" -#endif - -#ifdef CONFIG_TWOLAME -#include "ae_twolame.h" -#endif - -audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params) -{ - int ris; - audio_encoder_t *encoder; - if(! params) - return NULL; - - encoder = calloc(1, sizeof(audio_encoder_t)); - memcpy(&encoder->params, params, sizeof(audio_encoding_params_t)); - encoder->stream = stream; - - switch(stream->codec) - { - case ACODEC_PCM: - ris = mpae_init_pcm(encoder); - break; -#ifdef CONFIG_TOOLAME - case ACODEC_TOOLAME: - ris = mpae_init_toolame(encoder); - break; -#endif -#ifdef CONFIG_LIBAVCODEC - case ACODEC_LAVC: - ris = mpae_init_lavc(encoder); - break; -#endif -#ifdef CONFIG_MP3LAME - case ACODEC_VBRMP3: - ris = mpae_init_lame(encoder); - break; -#endif -#ifdef CONFIG_FAAC - case ACODEC_FAAC: - ris = mpae_init_faac(encoder); - break; -#endif -#ifdef CONFIG_TWOLAME - case ACODEC_TWOLAME: - ris = mpae_init_twolame(encoder); - break; -#endif - default: - ris = 0; - break; - } - - if(! ris) - { - free(encoder); - return NULL; - } - encoder->bind(encoder, stream); - encoder->decode_buffer = malloc(encoder->decode_buffer_size); - if(! encoder->decode_buffer) - { - free(encoder); - return NULL; - } - - encoder->codec = stream->codec; - return encoder; -} diff --git a/libmpcodecs/ae.h b/libmpcodecs/ae.h deleted file mode 100644 index 440e4ddf4f..0000000000 --- a/libmpcodecs/ae.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_AE_H -#define MPLAYER_AE_H - -#include "libmpdemux/muxer.h" - -#define ACODEC_COPY 0 -#define ACODEC_PCM 1 -#define ACODEC_VBRMP3 2 -#define ACODEC_NULL 3 -#define ACODEC_LAVC 4 -#define ACODEC_TOOLAME 5 -#define ACODEC_FAAC 6 -#define ACODEC_TWOLAME 7 - -#define AE_NEEDS_COMPRESSED_INPUT 1 - -typedef struct { - int channels; - int sample_rate; - int bitrate; - int samples_per_frame; - int audio_preload; -} audio_encoding_params_t; - -typedef struct audio_encoder_s { - int codec; - int flags; - muxer_stream_t *stream; - audio_encoding_params_t params; - int audio_preload; //in ms - int input_format; - int min_buffer_size, max_buffer_size; //for init_audio_filters - unsigned char *decode_buffer; - int decode_buffer_size; - int decode_buffer_len; - void *priv; - int (*bind)(struct audio_encoder_s*, muxer_stream_t*); - int (*get_frame_size)(struct audio_encoder_s*); - int (*set_decoded_len)(struct audio_encoder_s *encoder, int len); - int (*encode)(struct audio_encoder_s *encoder, uint8_t *dest, void *src, int nsamples, int max_size); - void (*fixup)(struct audio_encoder_s *encoder); - int (*close)(struct audio_encoder_s *encoder); -} audio_encoder_t; - -audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params); - -#endif /* MPLAYER_AE_H */ diff --git a/libmpcodecs/ae_faac.c b/libmpcodecs/ae_faac.c deleted file mode 100644 index 63c716378d..0000000000 --- a/libmpcodecs/ae_faac.c +++ /dev/null @@ -1,215 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of |