Mercurial > mplayer.hg
changeset 32142:4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
There is little point in assuming that some parts of FFmpeg might be
available without the others. Plus, mixing and matching static and
shared FFmpeg libraries was never supported.
| author | diego |
|---|---|
| date | Mon, 13 Sep 2010 18:19:25 +0000 |
| parents | 2802b8095bf7 |
| children | 1203050ff67f |
| files | Makefile cfg-common.h cfg-mencoder.h cfg-mplayer.h configure libaf/af.c libmpcodecs/ad.c libmpcodecs/ae.c libmpcodecs/ae_lavc.c libmpcodecs/vd.c libmpcodecs/ve.c libmpcodecs/vf.c libmpcodecs/vf_pp.c libmpdemux/demux_rtp_codec.cpp libmpdemux/demux_rtp_internal.h libmpdemux/demuxer.c libmpdemux/muxer.c libvo/video_out.c mencoder.c mpcommon.c stream/network.c stream/stream.c |
| diffstat | 22 files changed, 144 insertions(+), 437 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Sep 13 18:09:29 2010 +0000 +++ b/Makefile Mon Sep 13 18:19:25 2010 +0000 @@ -98,6 +98,27 @@ libfaad2/tns.c \ SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c +SRCS_COMMON-$(FFMPEG) += av_opts.c \ + av_sub.c \ + libaf/af_lavcresample.c \ + libmpcodecs/ad_ffmpeg.c \ + libmpcodecs/vd_ffmpeg.c \ + libmpcodecs/vf_lavc.c \ + libmpcodecs/vf_lavcdeint.c \ + libmpcodecs/vf_pp.c \ + libmpcodecs/vf_screenshot.c \ + libmpdemux/demux_lavf.c \ + stream/stream_ffmpeg.c \ + +# These filters use private headers and do not work with shared FFmpeg. +SRCS_COMMON-$(FFMPEG_A) += libaf/af_lavcac3enc.c \ + libmpcodecs/vf_fspp.c \ + libmpcodecs/vf_geq.c \ + libmpcodecs/vf_mcdeint.c \ + libmpcodecs/vf_qp.c \ + libmpcodecs/vf_spp.c \ + libmpcodecs/vf_uspp.c \ + SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c SRCS_COMMON-$(FTP) += stream/stream_ftp.c SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c @@ -123,27 +144,6 @@ libass/ass_strtod.c \ libass/ass_utils.c \ -SRCS_COMMON-$(LIBAVCODEC) += av_opts.c \ - av_sub.c \ - libaf/af_lavcresample.c \ - libmpcodecs/ad_ffmpeg.c \ - libmpcodecs/vd_ffmpeg.c \ - libmpcodecs/vf_lavc.c \ - libmpcodecs/vf_lavcdeint.c \ - libmpcodecs/vf_screenshot.c \ - -# These filters use private headers and do not work with shared libavcodec. -SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c \ - libmpcodecs/vf_fspp.c \ - libmpcodecs/vf_geq.c \ - libmpcodecs/vf_mcdeint.c \ - libmpcodecs/vf_qp.c \ - libmpcodecs/vf_spp.c \ - libmpcodecs/vf_uspp.c \ - -SRCS_COMMON-$(LIBAVFORMAT) += libmpdemux/demux_lavf.c \ - stream/stream_ffmpeg.c \ - SRCS_COMMON-$(LIBBLURAY) += stream/stream_bluray.c SRCS_COMMON-$(LIBBS2B) += libaf/af_bs2b.c SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c @@ -181,7 +181,6 @@ SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ stream/stream_nemesi.c SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c -SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ @@ -547,6 +546,7 @@ SRCS_MPLAYER-$(DXR3) += libvo/vo_dxr3.c SRCS_MPLAYER-$(ESD) += libao2/ao_esd.c SRCS_MPLAYER-$(FBDEV) += libvo/vo_fbdev.c libvo/vo_fbdev2.c +SRCS_MPLAYER-$(FFMPEG) += libvo/vo_png.c SRCS_MPLAYER-$(GGI) += libvo/vo_ggi.c SRCS_MPLAYER-$(GIF) += libvo/vo_gif89a.c SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_gl.c \ @@ -597,7 +597,6 @@ SRCS_MPLAYER-$(JPEG) += libvo/vo_jpeg.c SRCS_MPLAYER-$(KAI) += libao2/ao_kai.c SRCS_MPLAYER-$(KVA) += libvo/vo_kva.c -SRCS_MPLAYER-$(LIBAVCODEC) += libvo/vo_png.c SRCS_MPLAYER-$(LIBMENU) += libmenu/menu.c \ libmenu/menu_chapsel.c \ libmenu/menu_cmdlist.c \ @@ -690,8 +689,9 @@ 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-$(FFMPEG) += libmpcodecs/ae_lavc.c \ + libmpcodecs/ve_lavc.c \ + libmpdemux/muxer_lavf.c SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c \ libmpcodecs/native/rtjpegn.c @@ -718,12 +718,12 @@ $(SRCS_MENCODER-yes) -COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a -COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a -COMMON_LIBS-$(LIBAVCORE_A) += libavcore/libavcore.a -COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a -COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a -COMMON_LIBS-$(LIBSWSCALE_A) += libswscale/libswscale.a +COMMON_LIBS-$(FFMPEG_A) += libavformat/libavformat.a \ + libavcodec/libavcodec.a \ + libavcore/libavcore.a \ + libavutil/libavutil.a \ + libpostproc/libpostproc.a \ + libswscale/libswscale.a COMMON_LIBS += $(COMMON_LIBS-yes) OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)))
--- a/cfg-common.h Mon Sep 13 18:09:29 2010 +0000 +++ b/cfg-common.h Mon Sep 13 18:19:25 2010 +0000 @@ -524,10 +524,8 @@ {"vc", &video_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, // postprocessing: -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG {"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL}, -#endif -#ifdef CONFIG_LIBPOSTPROC {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL}, #endif @@ -554,10 +552,8 @@ {"noslices", &vd_use_slices, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"field-dominance", &field_dominance, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL}, -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG {"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, -#endif -#ifdef CONFIG_LIBAVFORMAT {"lavfdopts", lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif #ifdef CONFIG_XVID4
--- a/cfg-mencoder.h Mon Sep 13 18:09:29 2010 +0000 +++ b/cfg-mencoder.h Mon Sep 13 18:19:25 2010 +0000 @@ -51,7 +51,7 @@ #ifdef CONFIG_LIBLZO " nuv - nuppel video\n" #endif -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG " lavc - libavcodec codecs - best quality!\n" #endif #ifdef CONFIG_WIN32DLL @@ -79,11 +79,11 @@ #else {"mp3lame", "MPlayer was compiled without libmp3lame support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif /* CONFIG_MP3LAME */ -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG {"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 */ +#endif /* CONFIG_FFMPEG */ #ifdef CONFIG_TOOLAME {"toolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TOOLAME, NULL}, #else @@ -105,7 +105,7 @@ #ifdef CONFIG_MP3LAME " mp3lame - cbr/abr/vbr MP3 using libmp3lame\n" #endif -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n" #endif #ifdef CONFIG_TOOLAME @@ -144,7 +144,7 @@ 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 +#ifdef CONFIG_FFMPEG {"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}, @@ -152,7 +152,7 @@ {"help", "\nAvailable output formats:\n" " avi - Microsoft Audio/Video Interleaved\n" " mpeg - MPEG-1/2 system stream format\n" -#ifdef CONFIG_LIBAVFORMAT +#ifdef CONFIG_FFMPEG " lavf - FFmpeg libavformat muxers\n" #endif " rawvideo - (video only, one stream only) raw stream, no muxing\n" @@ -223,11 +223,11 @@ #ifdef CONFIG_MP3LAME {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG {"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 */ +#endif /* CONFIG_FFMPEG */ #ifdef CONFIG_TOOLAME {"toolameopts", toolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #else @@ -257,7 +257,7 @@ {"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 +#ifdef CONFIG_FFMPEG {"lavfopts", lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif
--- a/cfg-mplayer.h Mon Sep 13 18:09:29 2010 +0000 +++ b/cfg-mplayer.h Mon Sep 13 18:19:25 2010 +0000 @@ -23,6 +23,7 @@ * config for cfgparser */ +#include <stddef.h> #include "cfg-common.h" #include "gui/interface.h" #include "input/lirc.h"
--- a/configure Mon Sep 13 18:09:29 2010 +0000 +++ b/configure Mon Sep 13 18:19:25 2010 +0000 @@ -344,19 +344,8 @@ decoder) [autodetect] --disable-libvpx-lavc disable libvpx in libavcodec [autodetect] --disable-libnut disable libnut [autodetect] - --disable-libavutil_a disable static libavutil [autodetect] - --disable-libavcodec_a disable static libavcodec [autodetect] - --disable-libavcore_a disable static libavcore [autodetect] - --disable-libavformat_a disable static libavformat [autodetect] - --disable-libpostproc_a disable static libpostproc [autodetect] - --disable-libswscale_a disable static libswscale [autodetect] - --disable-libavutil_so disable shared libavutil [autodetect] - --disable-libavcodec_so disable shared libavcodec [autodetect] - --disable-libavcore_so disable shared libavcore [autodetect] - --disable-libavformat_so disable shared libavformat [autodetect] - --disable-libpostproc_so disable shared libpostproc [autodetect] - --disable-libswscale_so disable shared libswscale [autodetect] - --enable-system-ffmpeg use system ffmpeg libraries [no] + --disable-ffmpeg_a disable static FFmpeg [autodetect] + --disable-ffmpeg_so disable shared FFmpeg [autodetect] --disable-libavcodec_mpegaudio_hp disable high precision audio decoding in libavcodec [enabled] --disable-tremor-internal disable internal Tremor [enabled] @@ -585,20 +574,9 @@ _runtime_cpudetection=no _cross_compile=auto _prefix="/usr/local" -_libavutil_a=auto -_libavutil_so=auto -_libavcodec_a=auto -_libavcodec_so=auto +ffmpeg_a=auto +ffmpeg_so=auto _libavcodec_mpegaudio_hp=yes -_libavformat_a=auto -_libavformat_so=auto -_libpostproc_a=auto -_libpostproc_so=auto -_libswscale_a=auto -_libswscale_so=auto -_libavcore_a=auto -_libavcore_so=auto -_system_ffmpeg=no _libopencore_amrnb=auto _libopencore_amrwb=auto libopenjpeg=auto @@ -1209,18 +1187,6 @@ --disable-libvpx-lavc) _libvpx_lavc=no ;; --enable-libnut) _libnut=yes ;; --disable-libnut) _libnut=no ;; - --enable-libavutil_a) _libavutil_a=yes ;; - --disable-libavutil_a) _libavutil_a=no ;; - --enable-libavutil_so) _libavutil_so=yes ;; - --disable-libavutil_so) _libavutil_so=no ;; - --enable-libavcodec_a) _libavcodec_a=yes ;; - --disable-libavcodec_a) _libavcodec_a=no ;; - --enable-libavcodec_so) _libavcodec_so=yes ;; - --disable-libavcodec_so) _libavcodec_so=no ;; - --enable-libavcore_a) _libavcore_a=yes ;; - --disable-libavcore_a) _libavcore_a=no ;; - --enable-libavcore_so) _libavcore_so=yes ;; - --disable-libavcore_so) _libavcore_so=no ;; --enable-libopencore_amrnb) _libopencore_amrnb=yes ;; --disable-libopencore_amrnb) _libopencore_amrnb=no ;; --enable-libopencore_amrwb) _libopencore_amrwb=yes ;; @@ -1237,24 +1203,10 @@ --disable-demuxer=*) libavdemuxers=$(echo $libavdemuxers | sed "s/$(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')//g") ;; --enable-muxer=*) libavmuxers="$libavmuxers $(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')" ;; --disable-muxer=*) libavmuxers=$(echo $libavmuxers | sed "s/$(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')//g") ;; - --enable-libavformat_a) _libavformat_a=yes ;; - --disable-libavformat_a) _libavformat_a=no ;; - --enable-libavformat_so) _libavformat_so=yes ;; - --disable-libavformat_so) _libavformat_so=no ;; - --enable-libpostproc_a) _libpostproc_a=yes ;; - --disable-libpostproc_a) _libpostproc_a=no ;; - --enable-libpostproc_so) _libpostproc_so=yes ;; - --disable-libpostproc_so) _libpostproc_so=no ;; - --enable-libswscale_a) _libswscale_a=yes ;; - --disable-libswscale_a) _libswscale_a=no ;; - --enable-libswscale_so) _libswscale_so=yes ;; - --disable-libswscale_so) _libswscale_so=no ;; - --enable-system-ffmpeg) _libavcore_a=no ; _libavcore_so=yes - _libavutil_a=no ; _libavutil_so=yes - _libavcodec_a=no ; _libavcodec_so=yes - _libswscale_a=no ; _libswscale_so=yes - _libavformat_a=no ; _libavformat_so=yes - _libpostproc_a=no ; _libpostproc_so=yes ;; + --enable-ffmpeg_a) ffmpeg_a=yes ;; + --disable-ffmpeg_a) ffmpeg_a=no ;; + --enable-ffmpeg_so) ffmpeg_so=yes ;; + --disable-ffmpeg_so) ffmpeg_so=no ;; --enable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=yes ;; --disable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=no ;; @@ -7007,7 +6959,7 @@ def_faac_lavc="#define CONFIG_LIBFAAC 0" nocodecmodules="faac $nocodecmodules" fi -res_comment="in libavcodec: $_faac_lavc" +res_comment="in FFmpeg: $_faac_lavc" echores "$_faac" @@ -7321,226 +7273,48 @@ fi echores "$_librtmp" -echocheck "FFmpeg libavutil" -if test "$_libavutil_a" = auto ; then - if test -d libavutil ; then - _libavutil_a=yes - res_comment="static" - else - die "MPlayer will not compile without libavutil in the source tree." - fi -elif test "$_libavutil_so" = auto ; then - _libavutil_so=no - cat > $TMPC << EOF -#include <libavutil/common.h> -int main(void) { av_clip(1, 1, 1); return 0; } -EOF - if $_pkg_config --exists libavutil ; then - _inc_libavutil=$($_pkg_config --cflags libavutil) - _ld_tmp=$($_pkg_config --libs libavutil) - cc_check $_inc_libavutil $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \ - && _libavutil_so=yes - elif cc_check -lavutil $_ld_lm ; then - extra_ldflags="$extra_ldflags -lavutil" - _libavutil_so=yes - res_comment="using libavutil.so, but static libavutil is recommended" - fi -fi -_libavutil=no -def_libavutil='#undef CONFIG_LIBAVUTIL' -def_libavutil_a='#undef CONFIG_LIBAVUTIL_A' -def_libavutil_so='#undef CONFIG_LIBAVUTIL_SO' -test "$_libavutil_a" = yes || test "$_libavutil_so" = yes && _libavutil=yes -test "$_libavutil" = yes && def_libavutil='#define CONFIG_LIBAVUTIL 1' -test "$_libavutil_a" = yes && def_libavutil_a='#define CONFIG_LIBAVUTIL_A 1' -test "$_libavutil_so" = yes && def_libavutil_so='#define CONFIG_LIBAVUTIL_SO 1' -# neither static nor shared libavutil is available, but it is mandatory ... -if test "$_libavutil" = no ; then - die "You need static or shared libavutil, MPlayer will not compile without!" -fi -echores "$_libavutil" - -echocheck "FFmpeg libavcore" -if test "$_libavcore_a" = auto ; then - if test -d libavcore ; then - _libavcore_a=yes - res_comment="static" - fi -elif test "$_libavcore_so" = auto ; then - _libavcore_so=no - cat > $TMPC << EOF -#include <libavcore/avcore.h> -int main(void) { return 0; } -EOF + +echocheck "FFmpeg" +test -d libavutil || + die "MPlayer will not compile without libavutil in the source tree." +ffmpeg=no +if test "$ffmpeg_a" = auto ; then + test -d libavcore && ffmpeg_a=yes && ffmpeg=yes +elif test "$ffmpeg_so" = auto ; then + ffmpeg_so=no if $_pkg_config --exists libavcore ; then - _inc_libavcore=$($_pkg_config --cflags libavcore) + inc_ffmpeg=$($_pkg_config --cflags libavcore) _ld_tmp=$($_pkg_config --libs libavcore) - cc_check $_inc_libavcore $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \ - && _libavcore_so=yes - elif cc_check -lavcore $_ld_lm ; then - extra_ldflags="$extra_ldflags -lavcore" - _libavcore_so=yes - res_comment="using libavcore.so, but static libavcore is recommended" - fi -fi -_libavcore=no -def_libavcore='#undef CONFIG_LIBAVCORE' -def_libavcore_a='#undef CONFIG_LIBAVCORE_A' -def_libavcore_so='#undef CONFIG_LIBAVCORE_SO' -test "$_libavcore_a" = yes || test "$_libavcore_so" = yes && _libavcore=yes -test "$_libavcore" = yes && def_libavcore='#define CONFIG_LIBAVCORE 1' -test "$_libavcore_a" = yes && def_libavcore_a='#define CONFIG_LIBAVCORE_A 1' -test "$_libavcore_so" = yes && def_libavcore_so='#define CONFIG_LIBAVCORE_SO 1' -# neither static nor shared libavcore is available, but it is mandatory ... -if test "$_libavcore" = no ; then - die "You need static or shared libavcore, MPlayer will not compile without!" -fi -echores "$_libavcore" - -echocheck "FFmpeg libavcodec" -if test "$_libavcodec_a" = auto ; then - _libavcodec_a=no - if test -d libavcodec && test -f libavcodec/utils.c ; then - _libavcodec_a="yes" - res_comment="static" - fi -elif test "$_libavcodec_so" = auto ; then - _libavcodec_so=no - res_comment="libavcodec.so is discouraged over static libavcodec" - cat > $TMPC << EOF -#include <libavcodec/avcodec.h> -int main(void) { avcodec_find_encoder_by_name(""); return 0; } -EOF - if $_pkg_config --exists libavcodec ; then - _inc_libavcodec=$($_pkg_config --cflags libavcodec) - _ld_tmp=$($_pkg_config --libs libavcodec) - cc_check $_inc_libavcodec $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \ - && _libavcodec_so=yes - elif cc_check -lavcodec $_ld_lm ; then - extra_ldflags="$extra_ldflags -lavcodec" - _libavcodec_so=yes - res_comment="using libavcodec.so, but static libavcodec is recommended" - fi -fi -_libavcodec=no -def_libavcodec='#undef CONFIG_LIBAVCODEC' -def_libavcodec_a='#undef CONFIG_LIBAVCODEC_A' -def_libavcodec_so='#undef CONFIG_LIBAVCODEC_SO' -test "$_libavcodec_a" = yes || test "$_libavcodec_so" = yes && _libavcodec=yes -test "$_libavcodec" = yes && def_libavcodec='#define CONFIG_LIBAVCODEC 1' -test "$_libavcodec_a" = yes && def_libavcodec_a='#define CONFIG_LIBAVCODEC_A 1' -test "$_libavcodec_so" = yes && def_libavcodec_so='#define CONFIG_LIBAVCODEC_SO 1' + header_check libavcore/avcore.h $inc_ffmpeg $_ld_tmp && + extra_ldflags="$extra_ldflags $_ld_tmp" && ffmpeg_so=yes && ffmpeg=yes + elif header_check libavcore/avcore.h -lpostproc -lswscale -lavformat -lavcodec -lavutil -lavcore $_ld_lm ; then + extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil -lavcore" + ffmpeg_so=yes + ffmpeg=yes + fi +fi + +if test "$ffmpeg" = yes; then + def_ffmpeg='#define CONFIG_FFMPEG 1' + if test "$ffmpeg_a" = yes ; then + codecmodules="ffmpeg(internal) $codecmodules" + def_ffmpeg_a='#define CONFIG_FFMPEG_A 1' + elif test "$ffmpeg_so" = yes ; then + codecmodules="ffmpeg $codecmodules" + def_ffmpeg_so='#define CONFIG_FFMPEG_SO 1' + res_comment="using shared FFmpeg, but static FFmpeg is recommended" + fi +else + def_ffmpeg='#undef CONFIG_FFMPEG' + def_ffmpeg_a='#undef CONFIG_FFMPEG_A' + def_ffmpeg_so='#undef CONFIG_FFMPEG_SO' + nocodecmodules="ffmpeg $nocodecmodules" +fi test "$_libavcodec_mpegaudio_hp" = yes \ && def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' \ && mak_libavcodec_mpegaudio_hp='CONFIG_MPEGAUDIO_HP = yes' -if test "$_libavcodec_a" = yes ; then - codecmodules="libavcodec(internal) $codecmodules" -elif test "$_libavcodec_so" = yes ; then - codecmodules="libavcodec.so $codecmodules" -else - nocodecmodules="libavcodec $nocodecmodules" -fi -echores "$_libavcodec" - -echocheck "FFmpeg libavformat" -if test "$_libavformat_a" = auto ; then - _libavformat_a=no - if test -d libavformat && test -f libavformat/utils.c ; then - _libavformat_a=yes - res_comment="static" - fi -elif test "$_libavformat_so" = auto ; then - _libavformat_so=no - cat > $TMPC <<EOF - #include <libavformat/avformat.h> - int main(void) { av_alloc_format_context(); return 0; } -EOF - if $_pkg_config --exists libavformat ; then - _inc_libavformat=$($_pkg_config --cflags libavformat) - _ld_tmp=$($_pkg_config --libs libavformat) - cc_check $_inc_libavformat $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \ - && _libavformat_so=yes - elif cc_check $_ld_lm -lavformat ; then - extra_ldflags="$extra_ldflags -lavformat" - _libavformat_so=yes - res_comment="using libavformat.so, but static libavformat is recommended" - fi -fi -_libavformat=no -def_libavformat='#undef CONFIG_LIBAVFORMAT' -def_libavformat_a='#undef CONFIG_LIBAVFORMAT_A' -def_libavformat_so='#undef CONFIG_LIBAVFORMAT_SO' -test "$_libavformat_a" = yes || test "$_libavformat_so" = yes && _libavformat=yes -test "$_libavformat" = yes && def_libavformat='#define CONFIG_LIBAVFORMAT 1' -test "$_libavformat_a" = yes && def_libavformat_a='#define CONFIG_LIBAVFORMAT_A 1' -test "$_libavformat_so" = yes \ - && def_libavformat_so='#define CONFIG_LIBAVFORMAT_SO 1' -echores "$_libavformat" - -echocheck "FFmpeg libpostproc" -if test "$_libpostproc_a" = auto ; then - _libpostproc_a=no - if test -d libpostproc && test -f libpostproc/postprocess.h ; then - _libpostproc_a='yes' - res_comment="static" - fi -elif test "$_libpostproc_so" = auto ; then - _libpostproc_so=no - cat > $TMPC << EOF - #include <libpostproc/postprocess.h> - int main(void) { pp_get_mode_by_name_and_quality("de", 0); return 0; } -EOF - if cc_check -lpostproc $_ld_lm ; then - extra_ldflags="$extra_ldflags -lpostproc" - _libpostproc_so=yes - res_comment="using libpostproc.so, but static libpostproc is recommended" - fi -fi -_libpostproc=no -def_libpostproc='#undef CONFIG_LIBPOSTPROC' -def_libpostproc_a='#undef CONFIG_LIBPOSTPROC_A' -def_libpostproc_so='#undef CONFIG_LIBPOSTPROC_SO' -test "$_libpostproc_a" = yes || test "$_libpostproc_so" = yes && _libpostproc=yes -test "$_libpostproc" = yes && def_libpostproc='#define CONFIG_LIBPOSTPROC 1' -test "$_libpostproc_a" = yes && def_libpostproc_a='#define CONFIG_LIBPOSTPROC_A 1' -test "$_libpostproc_so" = yes \ - && def_libpostproc_so='#define CONFIG_LIBPOSTPROC_SO 1' -echores "$_libpostproc" - -echocheck "FFmpeg libswscale" -if test "$_libswscale_a" = auto ; then - _libswscale_a=no - if test -d libswscale && test -f libswscale/swscale.h ; then - _libswscale_a='yes' - res_comment="static" - fi -elif test "$_libswscale_so" = auto ; then - _libswscale_so=no - res_comment="using libswscale.so, but static libswscale is recommended" - cat > $TMPC << EOF - #include <libswscale/swscale.h> - int main(void) { sws_scale(0, 0, 0, 0, 0, 0, 0); return 0; } -EOF - if $_pkg_config --exists libswscale ; then - _inc_libswscale=$($_pkg_config --cflags libswscale) - _ld_tmp=$($_pkg_config --libs libswscale) - cc_check $_inc_libswscale $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \ - && _libswscale_so=yes - elif cc_check -lswscale ; then - extra_ldflags="$extra_ldflags -lswscale" - _libswscale_so=yes - fi -fi -_libswscale=no -def_libswscale='#undef CONFIG_LIBSWSCALE' -def_libswscale_a='#undef CONFIG_LIBSWSCALE_A' -def_libswscale_so='#undef CONFIG_LIBSWSCALE_SO' -test "$_libswscale_a" = yes || test "$_libswscale_so" = yes && _libswscale=yes -test "$_libswscale" = yes && def_libswscale='#define CONFIG_LIBSWSCALE 1' -test "$_libswscale_a" = yes && def_libswscale_a='#define CONFIG_LIBSWSCALE_A 1' -test "$_libswscale_so" = yes \ - && def_libswscale_so='#define CONFIG_LIBSWSCALE_SO 1' -echores "$_libswscale" +echores "$ffmpeg" + echocheck "libopencore_amr narrowband" @@ -7551,9 +7325,9 @@ int main(void) { Decoder_Interface_init(); return 0; } EOF cc_check -lopencore-amrnb && _libopencore_amrnb=yes - if test "$_libavcodec_a" != yes ; then + if test "$ffmpeg_a" != yes ; then _libopencore_amrnb=no - res_comment="libavcodec (static) is required by libopencore_amrnb, sorry" + res_comment="ffmpeg (static) is required by libopencore_amrnb, sorry" fi fi if test "$_libopencore_amrnb" = yes ; then @@ -7578,9 +7352,9 @@ int main(void) { D_IF_init(); return 0; } EOF cc_check -lopencore-amrwb && _libopencore_amrwb=yes - if test "$_libavcodec_a" != yes ; then + if test "$ffmpeg_a" != yes ; then _libopencore_amrwb=no - res_comment="libavcodec (static) is required by libopencore_amrwb, sorry" + res_comment="ffmpeg (static) is required by libopencore_amrwb, sorry" fi fi if test "$_libopencore_amrwb" = yes ; then @@ -7685,15 +7459,15 @@ def_x264_lavc='#define CONFIG_LIBX264 0' nocodecmodules="x264 $nocodecmodules" fi -res_comment="in libavcodec: $_x264_lavc" +res_comment="in FFmpeg: $_x264_lavc" echores "$_x264" echocheck "libdirac" if test "$_libdirac_lavc" = auto; then _libdirac_lavc=no - if test "$_libavcodec_a" != yes; then - res_comment="libavcodec (static) is required by libdirac, sorry" + if test "$ffmpeg_a" != yes; then + res_comment="ffmpeg (static) is required by libdirac, sorry" else cat > $TMPC << EOF #include <libdirac_encoder/dirac_encoder.h> @@ -7734,8 +7508,8 @@ echocheck "libschroedinger" if test "$_libschroedinger_lavc" = auto ; then _libschroedinger_lavc=no - if test "$_libavcodec_a" != yes; then - res_comment="libavcodec (static) is required by libschroedinger, sorry" + if test "$ffmpeg_a" != yes; then + res_comment="ffmpeg (static) is required by libschroedinger, sorry" else cat > $TMPC << EOF #include <schroedinger/schro.h> @@ -7765,8 +7539,8 @@ echocheck "libvpx" if test "$_libvpx_lavc" = auto; then _libvpx_lavc=no - if test "$_libavcodec_a" != yes; then - res_comment="dynamic linking to libvpx is irrelevant when using dynamic libavcodec" + if test "$ffmpeg_a" != yes; then + res_comment="dynamic linking to libvpx is irrelevant when using dynamic FFmpeg" else cat > $TMPC << EOF #include <vpx/vpx_encoder.h> @@ -7813,7 +7587,7 @@ fi echores "$_libnut" -#check must be done after libavcodec one +#check must be done after FFmpeg one echocheck "zr" if test "$_zr" = auto ; then #36067's seem to identify themselves as 36057PQC's, so the line @@ -7825,11 +7599,11 @@ fi fi if test "$_zr" = yes ; then - if test "$_libavcodec_a" = yes ; then + if test "$ffmpeg_a" = yes ; then def_zr='#define CONFIG_ZR 1' vomodules="zr zr2 $vomodules" else - res_comment="libavcodec (static) is required by zr, sorry" + res_comment="ffmpeg (static) is required by zr, sorry" novomodules="zr $novomodules" def_zr='#undef CONFIG_ZR' fi @@ -7880,7 +7654,7 @@ def_mp3lame='#undef CONFIG_MP3LAME' def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 0" fi -res_comment="in libavcodec: $_mp3lame_lavc" +res_comment="in FFmpeg: $_mp3lame_lavc" echores "$_mp3lame" fi # test "$_mencoder" != no @@ -8252,7 +8026,7 @@ if test "$_gui" = yes ; then # Required libraries - if test "$_libavcodec" != yes || + if test "$ffmpeg" != yes || ! echo $libavdecoders | grep -q PNG_DECODER ; then die "The GUI requires libavcodec with PNG support (needs zlib)." fi @@ -8833,24 +8607,8 @@ ZR = $_zr # FFmpeg -LIBAVUTIL = $_libavutil -LIBAVUTIL_A = $_libavutil_a -LIBAVUTIL_SO = $_libavutil_so -LIBAVCODEC = $_libavcodec -LIBAVCODEC_A = $_libavcodec_a -LIBAVCODEC_SO = $_libavcodec_so -LIBAVCORE = $_libavcore -LIBAVCORE_A = $_libavcore_a -LIBAVCORE_SO = $_libavcore_so -LIBAVFORMAT = $_libavformat -LIBAVFORMAT_A = $_libavformat_a -LIBAVFORMAT_SO = $_libavformat_so -LIBPOSTPROC = $_libpostproc -LIBPOSTPROC_A = $_libpostproc_a -LIBPOSTPROC_SO = $_libpostproc_so -LIBSWSCALE = $_libswscale -LIBSWSCALE_A = $_libswscale_a -LIBSWSCALE_SO = $_libswscale_so +FFMPEG = $ffmpeg +FFMPEG_A = $ffmpeg_a HOSTCC = \$(HOST_CC) HOSTCFLAGS = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3 @@ -9310,24 +9068,9 @@ /* FFmpeg */ -$def_libavcodec -$def_libavcodec_a -$def_libavcodec_so -$def_libavcore -$def_libavcore_a -$def_libavcore_so -$def_libavformat -$def_libavformat_a -$def_libavformat_so -$def_libavutil -$def_libavutil_a -$def_libavutil_so -$def_libpostproc -$def_libpostproc_a -$def_libpostproc_so -$def_libswscale -$def_libswscale_a -$def_libswscale_so +$def_ffmpeg +$def_ffmpeg_a +$def_ffmpeg_so #define CONFIG_DECODERS 1 #define CONFIG_ENCODERS 1 @@ -9420,7 +9163,7 @@ #define FFMPEG_CONFIGURATION "--enable-gpl --enable-postproc" #define FFMPEG_LICENSE "GPL version 2 or later" -/* External libraries used through libavcodec. */ +/* External libraries used through FFmpeg. */ $def_faac_lavc $def_libdirac_lavc $def_libgsm
--- a/libaf/af.c Mon Sep 13 18:09:29 2010 +0000 +++ b/libaf/af.c Mon Sep 13 18:19:25 2010 +0000 @@ -70,10 +70,10 @@ #endif &af_info_volnorm, &af_info_extrastereo, -#ifdef CONFIG_LIBAVCODEC_A +#ifdef CONFIG_FFMPEG_A &af_info_lavcac3enc, #endif -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG &af_info_lavcresample, #endif &af_info_sweep, @@ -470,7 +470,7 @@ &(s->output.rate)); if (!af) { char *resampler = "resample"; -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW) resampler = "lavcresample"; #endif @@ -494,7 +494,7 @@ if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_FAST) { char args[32]; sprintf(args, "%d", s->output.rate); -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG if (strcmp(resampler, "lavcresample") == 0) strcat(args, ":1"); else
--- a/libmpcodecs/ad.c Mon Sep 13 18:09:29 2010 +0000 +++ b/libmpcodecs/ad.c Mon Sep 13 18:19:25 2010 +0000 @@ -73,7 +73,7 @@ #endif &mpcodecs_ad_hwac3, &mpcodecs_ad_hwmpa, -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG &mpcodecs_ad_ffmpeg, #endif &mpcodecs_ad_pcm,
--- a/libmpcodecs/ae.c Mon Sep 13 18:09:29 2010 +0000 +++ b/libmpcodecs/ae.c Mon Sep 13 18:19:25 2010 +0000 @@ -58,7 +58,7 @@ ris = mpae_init_toolame(encoder); break; #endif -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG case ACODEC_LAVC: ris = mpae_init_lavc(encoder); break;
--- a/libmpcodecs/ae_lavc.c Mon Sep 13 18:09:29 2010 +0000 +++ b/libmpcodecs/ae_lavc.c Mon Sep 13 18:19:25 2010 +0000 @@ -38,14 +38,12 @@ #include "libaf/reorder_ch.h" #include "libavcodec/avcodec.h" #include "libavutil/intreadwrite.h" +#include "libavformat/avformat.h" +#include "libmpdemux/mp_taglists.h" static AVCodec *lavc_acodec; static AVCodecContext *lavc_actx; static int compressed_frame_size = 0; -#ifdef CONFIG_LIBAVFORMAT -#include "libavformat/avformat.h" -#include "libmpdemux/mp_taglists.h" -#endif static int bind_lavc(audio_encoder_t *encoder, muxer_stream_t *mux_a) { @@ -149,31 +147,6 @@ return sz; } -#ifndef CONFIG_LIBAVFORMAT -static uint32_t lavc_find_atag(char *codec) -{ - if(codec == NULL) - return 0; - - if(! strcasecmp(codec, "mp2")) - return 0x50; - - if(! strcasecmp(codec, "mp3")) - return 0x55; - - if(! strcasecmp(codec, "ac3")) - return 0x2000; - - if(! strcasecmp(codec, "adpcm_ima_wav")) - return 0x11; - - if(! strncasecmp(codec, "bonk", 4)) - return 0x2048; - - return 0; -} -#endif - int mpae_init_lavc(audio_encoder_t *encoder) { @@ -196,11 +169,7 @@ } if(lavc_param_atag == 0) { -#ifdef CONFIG_LIBAVFORMAT lavc_param_atag = av_codec_get_tag(mp_wav_taglists, lavc_acodec->id); -#else - lavc_param_atag = lavc_find_atag(lavc_param_acodec); -#endif if(!lavc_param_atag) { mp_msg(MSGT_MENCODER, MSGL_FATAL, "Couldn't find wav tag for specified codec, exit\n");
--- a/libmpcodecs/vd.c Mon Sep 13 18:09:29 2010 +0000 +++ b/libmpcodecs/vd.c Mon Sep 13 18:19:25 2010 +0000 @@ -65,7 +65,7 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = { &mpcodecs_vd_null, -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG &mpcodecs_vd_ffmpeg, #endif #ifdef CONFIG_OGGTHEORA
--- a/libmpcodecs/ve.c Mon Sep 13 18:09:29 2010 +0000 +++ b/libmpcodecs/ve.c Mon Sep 13 18:19:25 2010 +0000 @@ -41,7 +41,7 @@ * libraries and encoders requiring binary support. */ static const vf_info_t * const encoder_list[] = { -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG &ve_info_lavc, #endif #ifdef CONFIG_WIN32DLL
--- a/libmpcodecs/vf.c Mon Sep 13 18:09:29 2010 +0000 +++ b/libmpcodecs/vf.c Mon Sep 13 18:19:25 2010 +0000 @@ -127,9 +127,6 @@ #endif &vf_info_crop, &vf_info_expand, -#ifdef CONFIG_LIBPOSTPROC - &vf_info_pp, -#endif &vf_info_scale, // &vf_info_osd, &vf_info_vo, @@ -140,7 +137,8 @@ &vf_info_mirror, &vf_info_palette, &vf_info_pp7, -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG + &vf_info_pp, &vf_info_lavc, &vf_info_lavcdeint, &vf_info_screenshot, @@ -188,7 +186,7 @@ &vf_info_delogo, &vf_info_remove_logo, &vf_info_hue, -#ifdef CONFIG_LIBAVCODEC_A +#ifdef CONFIG_FFMPEG_A &vf_info_spp, &vf_info_uspp, &vf_info_fspp,
--- a/libmpcodecs/vf_pp.c Mon Sep 13 18:09:29 2010 +0000 +++ b/libmpcodecs/vf_pp.c Mon Sep 13 18:19:25 2010 +0000 @@ -37,7 +37,7 @@ #include "libavutil/internal.h" #include "libpostproc/postprocess.h" -#ifdef CONFIG_LIBPOSTPROC_A +#ifdef CONFIG_FFMPEG_A #define EMU_OLD #include "libpostproc/postprocess_internal.h" #endif
--- a/libmpdemux/demux_rtp_codec.cpp Mon Sep 13 18:09:29 2010 +0000 +++ b/libmpdemux/demux_rtp_codec.cpp Mon Sep 13 18:19:25 2010 +0000 @@ -27,7 +27,7 @@ #include "libavutil/base64.h" } -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG AVCodecParserContext * h264parserctx; AVCodecContext *avcctx; #endif @@ -134,7 +134,7 @@ unsigned char* configData = parseH264ConfigStr(subsession->fmtp_spropparametersets(), configLen); sh_video->bih = bih = insertVideoExtradata(bih, configData, configLen); -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG int fooLen; const uint8_t* fooData; avcodec_register_all();
--- a/libmpdemux/demux_rtp_internal.h Mon Sep 13 18:09:29 2010 +0000 +++ b/libmpdemux/demux_rtp_internal.h Mon Sep 13 18:19:25 2010 +0000 @@ -25,7 +25,7 @@ extern "C" { #include "demuxer.h" -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG #include "libavcodec/avcodec.h" #endif }
--- a/libmpdemux/demuxer.c Mon Sep 13 18:09:29 2010 +0000 +++ b/libmpdemux/demuxer.c Mon Sep 13 18:19:25 2010 +0000 @@ -49,7 +49,7 @@ #include "libass/ass_mp.h" #endif -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG #include "libavcodec/avcodec.h" #if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE #error MP_INPUT_BUFFER_PADDING_SIZE is too small! @@ -122,7 +122,7 @@ &demuxer_desc_tv, #endif &demuxer_desc_mf, -#ifdef CONFIG_LIBAVFORMAT +#ifdef CONFIG_FFMPEG &demuxer_desc_lavf_preferred, #endif &demuxer_desc_avi, @@ -165,7 +165,7 @@ #ifdef CONFIG_LIBNEMESI &demuxer_desc_rtp_nemesi, #endif -#ifdef CONFIG_LIBAVFORMAT +#ifdef CONFIG_FFMPEG &demuxer_desc_lavf, #endif #ifdef CONFIG_MUSEPACK @@ -306,7 +306,7 @@ ass_free_track(sh->ass_track); #endif free(sh->lang); -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG clear_parser((sh_common_t *)sh); #endif free(sh); @@ -350,7 +350,7 @@ free(sh->wf); free(sh->codecdata); free(sh->lang); -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG clear_parser((sh_common_t *)sh); #endif free(sh); @@ -381,7 +381,7 @@ { mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh); free(sh->bih); -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG clear_parser((sh_common_t *)sh); #endif free(sh); @@ -457,7 +457,7 @@ ds->demuxer->video->packs); } -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parser, unsigned format) { enum CodecID codec_id = CODEC_ID_NONE; @@ -553,7 +553,7 @@ void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp) { -#if PARSE_ON_ADD && defined(CONFIG_LIBAVCODEC) +#if PARSE_ON_ADD && defined(CONFIG_FFMPEG) int len = dp->len; int pos = 0; while (len > 0) { @@ -675,7 +675,7 @@ break; } if (!demux_fill_buffer(demux, ds)) { -#if PARSE_ON_ADD && defined(CONFIG_LIBAVCODEC) +#if PARSE_ON_ADD && defined(CONFIG_FFMPEG) uint8_t *parsed_start = NULL; int parsed_len = 0; ds_parse(ds->sh, &parsed_start, &parsed_len, MP_NOPTS_VALUE, 0);
--- a/libmpdemux/muxer.c Mon Sep 13 18:09:29 2010 +0000 +++ b/libmpdemux/muxer.c Mon Sep 13 18:19:25 2010 +0000 @@ -51,7 +51,7 @@ if(! muxer_init_muxer_rawaudio(muxer)) goto fail; break; -#ifdef CONFIG_LIBAVFORMAT +#ifdef CONFIG_FFMPEG case MUXER_TYPE_LAVF: if(! muxer_init_muxer_lavf(muxer)) goto fail;
--- a/libvo/video_out.c Mon Sep 13 18:09:29 2010 +0000 +++ b/libvo/video_out.c Mon Sep 13 18:19:25 2010 +0000 @@ -272,7 +272,7 @@ #ifdef CONFIG_YUV4MPEG &video_out_yuv4mpeg, #endif -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG &video_out_png, #endif #ifdef CONFIG_JPEG
--- a/mencoder.c Mon Sep 13 18:09:29 2010 +0000 +++ b/mencoder.c Mon Sep 13 18:19:25 2010 +0000 @@ -899,7 +899,7 @@ mux_v->source=sh_video; mux_v->h.dwSampleSize=0; // VBR -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG { double fps = force_ofps?force_ofps:sh_video->fps*playback_speed; AVRational q= av_d2q(fps, fps*1001+2);
--- a/mpcommon.c Mon Sep 13 18:09:29 2010 +0000 +++ b/mpcommon.c Mon Sep 13 18:19:25 2010 +0000 @@ -111,7 +111,7 @@ spudec_reset(vo_spudec); vo_osd_changed(OSDTYPE_SPU); } -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG if (is_av_sub(type)) reset_avsub(d_dvdsub->sh); #endif @@ -192,7 +192,7 @@ if (len < 0) break; if (is_av_sub(type)) { -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG type = decode_avsub(d_dvdsub->sh, &packet, &len, &subpts, &endpts); if (type <= 0) #endif
--- a/stream/network.c Mon Sep 13 18:09:29 2010 +0000 +++ b/stream/network.c Mon Sep 13 18:19:25 2010 +0000 @@ -65,7 +65,7 @@ const mime_struct_t mime_type_table[] = { -#ifdef CONFIG_LIBAVFORMAT +#ifdef CONFIG_FFMPEG // Flash Video { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED}, // do not force any demuxer in this case!