Merge svn changes up to r30907

1 files changed, 5 insertions, 25 deletions

diff --git a/mencoder.c b/mencoder.c
index df1c568cb9..bc7a3db059 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -272,8 +272,6 @@ static m_time_size_t end_at = { .type = END_AT_NONE, .pos = 0 };
 
 static char * frameno_filename=NULL;
 
-//static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height);
-
 typedef struct {
     unsigned char* start;
     int in_size;
@@ -412,8 +410,6 @@ void add_subtitles(char *filename, float fps, int silent)
     subdata = subd;
 }
 
-void print_wave_header(WAVEFORMATEX *h, int verbose_level);
-
 int main(int argc,char* argv[]){
 
 stream_t* stream=NULL;
@@ -541,6 +537,11 @@ if (frameno_filename) {
   set_priority();
 #endif
 
+#ifdef CONFIG_WIN32DLL
+  if (codec_path)
+    SetCodecPath(codec_path);
+#endif
+
 // check font
 #ifdef CONFIG_FREETYPE
   init_freetype();
@@ -1676,27 +1677,6 @@ return interrupted;
 }
 
 
-#if 0
-/* Flip the image in src and store the result in dst. src and dst may overlap.
-   width is the size of each line in bytes. */
-static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width,
-                                 int height)
-{
-    uint8_t* tmp = malloc(width);
-    int i;
-
-    for(i = 0; i < height/2; i++) {
-        fast_memcpy(tmp, &src[i*width], width);
-        fast_memcpy(&dst[i * width], &src[(height - i) * width], width);
-        fast_memcpy(&dst[(height - i) * width], tmp, width);
-    }
-
-    free(tmp);
-    return dst;
-}
-#endif
-
-
 static float stop_time(demuxer_t* demuxer, muxer_stream_t* mux_v) {
 	float timeleft = -1;
 	if (play_n_frames >= 0) timeleft = mux_v->timer + play_n_frames * (double)(mux_v->h.dwScale) / mux_v->h.dwRate;