From a743c0a73824f1f3bce5b59ef6d57e871d3f5022 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 18 Mar 2010 20:44:01 +0000
Subject: Split codec path related code into a separate file to fix Windows
 build.

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

(limited to 'mencoder.c')

diff --git a/mencoder.c b/mencoder.c
index 9d4450f9ba..b8a759180f 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -66,7 +66,7 @@
 #include "get_path.h"
 
 #ifdef CONFIG_WIN32DLL
-#include "loader/drv.h"         // for SetCodecPath()
+#include "loader/codecpath.h"         // for SetCodecPath()
 #endif
 
 #include "stream/stream.h"
-- 
cgit v1.2.3


From 77b8678bec42c297983a99ffe084e47418a70208 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 18 Mar 2010 20:57:49 +0000
Subject: Remove unnecessary #ifdefs around harmless loader/codecpath.h
 #include.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30931 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mencoder.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'mencoder.c')

diff --git a/mencoder.c b/mencoder.c
index b8a759180f..df916527bd 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -65,10 +65,7 @@
 #include "mp_fifo.h"
 #include "get_path.h"
 
-#ifdef CONFIG_WIN32DLL
-#include "loader/codecpath.h"         // for SetCodecPath()
-#endif
-
+#include "loader/codecpath.h"
 #include "stream/stream.h"
 #include "libmpdemux/aviprint.h"
 #include "libmpdemux/demuxer.h"
-- 
cgit v1.2.3


From a06a3d476d268f9e17769916ebabf684af95e5e4 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 20 Mar 2010 23:27:07 +0000
Subject: Move SetCodecPath() from loader to get_path.c and make it
 unconditional. This fixes compilation with the Win32 loader disabled but
 other binary codec loaders enabled.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30942 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mencoder.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'mencoder.c')

diff --git a/mencoder.c b/mencoder.c
index df916527bd..dcddaa649a 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -65,7 +65,6 @@
 #include "mp_fifo.h"
 #include "get_path.h"
 
-#include "loader/codecpath.h"
 #include "stream/stream.h"
 #include "libmpdemux/aviprint.h"
 #include "libmpdemux/demuxer.h"
@@ -667,10 +666,8 @@ if (frameno_filename) {
   set_priority();
 #endif
 
-#ifdef CONFIG_WIN32DLL
   if (codec_path)
     SetCodecPath(codec_path);
-#endif
 
 // check font
 #ifdef CONFIG_FREETYPE
-- 
cgit v1.2.3


From 70c66c04764421ca277c341657c556cb0f00ec9b Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 20 Mar 2010 23:38:27 +0000
Subject: Rename get_path.[ch] --> path.[ch]. These files now contain different
 functions related to path handling.

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

(limited to 'mencoder.c')

diff --git a/mencoder.c b/mencoder.c
index dcddaa649a..8b8b76c0ba 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -63,7 +63,7 @@
 #include "parser-mecmd.h"
 #include "parser-cfg.h"
 #include "mp_fifo.h"
-#include "get_path.h"
+#include "path.h"
 
 #include "stream/stream.h"
 #include "libmpdemux/aviprint.h"
-- 
cgit v1.2.3


From d84999d4800942d0ca099ba565e138423dc0d7da Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 21 Mar 2010 08:34:09 +0000
Subject: Rename SetCodecPath() --> set_codec_path(). This keeps the naming of
 all path-related functions consistent.

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

(limited to 'mencoder.c')

diff --git a/mencoder.c b/mencoder.c
index 8b8b76c0ba..c20e7a9eb8 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -667,7 +667,7 @@ if (frameno_filename) {
 #endif
 
   if (codec_path)
-    SetCodecPath(codec_path);
+    set_codec_path(codec_path);
 
 // check font
 #ifdef CONFIG_FREETYPE
-- 
cgit v1.2.3


From a630204d0aa9fc2733264cf7c3122026e1d5f964 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 24 Mar 2010 20:43:41 +0000
Subject: Mark add_subtitles() as static, it is not used outside the file,
 fixes: mencoder.c:337: warning: no previous prototype for 'add_subtitles'

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

(limited to 'mencoder.c')

diff --git a/mencoder.c b/mencoder.c
index c20e7a9eb8..e4add0d7f1 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -333,7 +333,7 @@ static void exit_sighandler(int x){
 
 static muxer_t* muxer=NULL;
 
-void add_subtitles(char *filename, float fps, int silent)
+static void add_subtitles(char *filename, float fps, int silent)
 {
     sub_data *subd;
 #ifdef CONFIG_ASS
-- 
cgit v1.2.3