From ce9b45e5284285f64d84ee9574c0d5baac1e1c05 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 31 Jan 2010 10:54:08 +0000
Subject: [PATCH 1/4] Add missing license header.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30476 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mp_msg-mencoder.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/mp_msg-mencoder.c b/mp_msg-mencoder.c
index d295020364..804d85dc42 100644
--- a/mp_msg-mencoder.c
+++ b/mp_msg-mencoder.c
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
 
 #define FOR_MENCODER 1
 #include "mp_msg.c"

From e3dfef6251d4f8cd21e9b153c0f61e2be922efb2 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 31 Jan 2010 10:55:36 +0000
Subject: [PATCH 2/4] Explain the need for a MEncoder version of the logging
 facilities.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30477 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mp_msg-mencoder.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mp_msg-mencoder.c b/mp_msg-mencoder.c
index 804d85dc42..4786f267da 100644
--- a/mp_msg-mencoder.c
+++ b/mp_msg-mencoder.c
@@ -16,5 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* Build an exact copy of the logging facilities without GUI dependencies. */
+
 #define FOR_MENCODER 1
 #include "mp_msg.c"

From 036a297ef1aaa77b6474cc4616090acc57753dfe Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 31 Jan 2010 14:14:20 +0000
Subject: [PATCH 3/4] Fix compilation for new Bink audio decoder.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30478 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 89c84bc3fb..7dcd9e961c 100755
--- a/configure
+++ b/configure
@@ -8671,6 +8671,7 @@ FULLNAME=\$(NAME)\$(BUILDSUF)
 
 # Some FFmpeg codecs depend on these. Enable them unconditionally for now.
 CONFIG_AANDCT=yes
+CONFIG_DCT=yes
 CONFIG_FFT=yes
 CONFIG_FFT_MMX=$fft_mmx
 CONFIG_GOLOMB=yes

From 2778dca1b4fe53d436ade4343ab8c2b62bc550ce Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 31 Jan 2010 15:11:16 +0000
Subject: [PATCH 4/4] Disable FFmpeg's network protocols if --disable-network
 was specified.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30479 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 7dcd9e961c..1c5f8090de 100755
--- a/configure
+++ b/configure
@@ -3304,6 +3304,7 @@ else
   _noinputmodules="network $_noinputmodules"
   def_network='#undef CONFIG_NETWORK'
   _ftp=no
+  _libavprotocols=$(echo $_libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL//)
 fi
 echores "$_network"