Commit a3deeaad authored by Rostislav Pehlivanov's avatar Rostislav Pehlivanov

lavf: remove the libnut library wrapper

libnut is outdated and not developed anymore, all nut developments
happens in this repo, so users are getting mislead
parent e091b9b3
...@@ -14,6 +14,7 @@ version <next>: ...@@ -14,6 +14,7 @@ version <next>:
- librsvg support for svg rasterization - librsvg support for svg rasterization
- crossfeed audio filter - crossfeed audio filter
- spec compliant VP9 muxing support in MP4 - spec compliant VP9 muxing support in MP4
- remove the libnut muxer/demuxer wrappers
version 3.3: version 3.3:
- CrystalHD decoder moved to new decode API - CrystalHD decoder moved to new decode API
......
...@@ -416,7 +416,6 @@ Muxers/Demuxers: ...@@ -416,7 +416,6 @@ Muxers/Demuxers:
iss.c Stefan Gehrer iss.c Stefan Gehrer
jvdec.c Peter Ross jvdec.c Peter Ross
libmodplug.c Clément Bœsch libmodplug.c Clément Bœsch
libnut.c Oded Shimon
libopenmpt.c Josh de Kock libopenmpt.c Josh de Kock
lmlm4.c Ivo van Poorten lmlm4.c Ivo van Poorten
lvfdec.c Paul B Mahol lvfdec.c Paul B Mahol
......
...@@ -234,8 +234,6 @@ External library support: ...@@ -234,8 +234,6 @@ External library support:
--enable-libkvazaar enable HEVC encoding via libkvazaar [no] --enable-libkvazaar enable HEVC encoding via libkvazaar [no]
--enable-libmodplug enable ModPlug via libmodplug [no] --enable-libmodplug enable ModPlug via libmodplug [no]
--enable-libmp3lame enable MP3 encoding via libmp3lame [no] --enable-libmp3lame enable MP3 encoding via libmp3lame [no]
--enable-libnut enable NUT (de)muxing via libnut,
native (de)muxer exists [no]
--enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no] --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no]
--enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no] --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
--enable-libopencv enable video filtering via libopencv [no] --enable-libopencv enable video filtering via libopencv [no]
...@@ -1553,7 +1551,6 @@ EXTERNAL_LIBRARY_LIST=" ...@@ -1553,7 +1551,6 @@ EXTERNAL_LIBRARY_LIST="
libkvazaar libkvazaar
libmodplug libmodplug
libmp3lame libmp3lame
libnut
libopencv libopencv
libopenh264 libopenh264
libopenjpeg libopenjpeg
...@@ -2940,8 +2937,6 @@ image2_alias_pix_demuxer_select="image2_demuxer" ...@@ -2940,8 +2937,6 @@ image2_alias_pix_demuxer_select="image2_demuxer"
image2_brender_pix_demuxer_select="image2_demuxer" image2_brender_pix_demuxer_select="image2_demuxer"
ipod_muxer_select="mov_muxer" ipod_muxer_select="mov_muxer"
ismv_muxer_select="mov_muxer" ismv_muxer_select="mov_muxer"
libnut_demuxer_deps="libnut"
libnut_muxer_deps="libnut"
matroska_audio_muxer_select="matroska_muxer" matroska_audio_muxer_select="matroska_muxer"
matroska_demuxer_select="iso_media riffdec" matroska_demuxer_select="iso_media riffdec"
matroska_demuxer_suggest="bzlib lzo zlib" matroska_demuxer_suggest="bzlib lzo zlib"
...@@ -5825,7 +5820,6 @@ enabled libmfx && { use_pkg_config libmfx "mfx/mfxvideo.h" MFXInit || ...@@ -5825,7 +5820,6 @@ enabled libmfx && { use_pkg_config libmfx "mfx/mfxvideo.h" MFXInit ||
{ require libmfx "mfx/mfxvideo.h" MFXInit -llibmfx && warn "using libmfx without pkg-config"; } } { require libmfx "mfx/mfxvideo.h" MFXInit -llibmfx && warn "using libmfx without pkg-config"; } }
enabled libmodplug && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load enabled libmodplug && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load
enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
enabled libnpp && require libnpp npp.h nppGetLibVersion -lnppi -lnppc enabled libnpp && require libnpp npp.h nppGetLibVersion -lnppi -lnppc
enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
......
...@@ -537,8 +537,6 @@ OBJS-$(CONFIG_AVISYNTH_DEMUXER) += avisynth.o ...@@ -537,8 +537,6 @@ OBJS-$(CONFIG_AVISYNTH_DEMUXER) += avisynth.o
OBJS-$(CONFIG_CHROMAPRINT_MUXER) += chromaprint.o OBJS-$(CONFIG_CHROMAPRINT_MUXER) += chromaprint.o
OBJS-$(CONFIG_LIBGME_DEMUXER) += libgme.o OBJS-$(CONFIG_LIBGME_DEMUXER) += libgme.o
OBJS-$(CONFIG_LIBMODPLUG_DEMUXER) += libmodplug.o OBJS-$(CONFIG_LIBMODPLUG_DEMUXER) += libmodplug.o
OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o
OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o
OBJS-$(CONFIG_LIBOPENMPT_DEMUXER) += libopenmpt.o OBJS-$(CONFIG_LIBOPENMPT_DEMUXER) += libopenmpt.o
OBJS-$(CONFIG_LIBRTMP) += librtmp.o OBJS-$(CONFIG_LIBRTMP) += librtmp.o
OBJS-$(CONFIG_LIBSSH_PROTOCOL) += libssh.o OBJS-$(CONFIG_LIBSSH_PROTOCOL) += libssh.o
......
...@@ -379,7 +379,6 @@ static void register_all(void) ...@@ -379,7 +379,6 @@ static void register_all(void)
REGISTER_MUXER (CHROMAPRINT, chromaprint); REGISTER_MUXER (CHROMAPRINT, chromaprint);
REGISTER_DEMUXER (LIBGME, libgme); REGISTER_DEMUXER (LIBGME, libgme);
REGISTER_DEMUXER (LIBMODPLUG, libmodplug); REGISTER_DEMUXER (LIBMODPLUG, libmodplug);
REGISTER_MUXDEMUX(LIBNUT, libnut);
REGISTER_DEMUXER (LIBOPENMPT, libopenmpt); REGISTER_DEMUXER (LIBOPENMPT, libopenmpt);
} }
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment