summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-12-11 07:48:26 +0200
committerUoti Urpala <uau@mplayer2.org>2011-12-11 07:48:26 +0200
commit2e1cdcb9e6263a7ca16151713338176ef7b1ee06 (patch)
treef90c2ac5f9642183106114a81bfb6c979622ea1f /stream
parentfc2d040b2248adaac816b999a90ad452ee1f2be6 (diff)
downloadmpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.bz2
mpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.xz
configure, build: remove --disable-libav support
Remove support for building the player without libavcodec and libavformat. These libraries are now always required.
Diffstat (limited to 'stream')
-rw-r--r--stream/network.c2
-rw-r--r--stream/stream.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/stream/network.c b/stream/network.c
index ce04444144..0961c8d12b 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -65,7 +65,6 @@ int network_ipv4_only_proxy = 0;
const mime_struct_t mime_type_table[] = {
-#ifdef CONFIG_FFMPEG
// Flash Video
{ "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED},
// do not force any demuxer in this case!
@@ -73,7 +72,6 @@ const mime_struct_t mime_type_table[] = {
// but for mov reference files to work we must also try
// the native demuxer if lavf fails.
{ "video/quicktime", 0 },
-#endif
// MP3 streaming, some MP3 streaming server answer with audio/mpeg
{ "audio/mpeg", DEMUXER_TYPE_AUDIO },
// MPEG streaming
diff --git a/stream/stream.c b/stream/stream.c
index fc5185827b..99225ca3b4 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -140,9 +140,7 @@ static const stream_info_t* const auto_open_streams[] = {
#ifdef CONFIG_LIBBLURAY
&stream_info_bluray,
#endif
-#ifdef CONFIG_FFMPEG
&stream_info_ffmpeg,
-#endif
&stream_info_null,
&stream_info_mf,