[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[55] mplayerxp

[<nic...@us...>]

Revision: 55
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=55&view=rev
Author:   nickols_k
Date:     2010-01-01 09:46:55 +0000 (Fri, 01 Jan 2010)

Log Message:
-----------
Fixed some lacks

Modified Paths:
--------------
    mplayerxp/configure
    mplayerxp/libmpcodecs/ad_ffmp3.c

Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure	2009-12-26 10:39:37 UTC (rev 54)
+++ mplayerxp/configure	2010-01-01 09:46:55 UTC (rev 55)
@@ -99,8 +99,8 @@
     "exec_prefix|architecture-dependent files|\$prefix",
     "bindir|user executables|\$exec_prefix/bin",
     "libdir|object code libraries|\$exec_prefix/lib",
-    "datadir|read-only architecture-independent data|\$prefix/share",
-    "confdir|read-only configuration files|\$prefix/share",
+    "datadir|read-only architecture-independent data|\$prefix/share/mplayerxp",
+    "confdir|read-only configuration files|\$prefix/share/mplayerxp",
     "codecdir|codec's shared libraries|\$libdir/mplayerxp",
     "win32libdir|win32 .dll locations [/usr/lib/win32]"
 )
@@ -313,7 +313,7 @@
 test -z "$libdir" && libdir="."
 test -z "$codecdir" && codecdir="."
 else
-test -z "$codecdir" && codecdir="$libdir/$prog_alias"
+codecdir="$libdir/$prog_alias"
 fi
 
 srcdir=`pwd`

Modified: mplayerxp/libmpcodecs/ad_ffmp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmp3.c	2009-12-26 10:39:37 UTC (rev 54)
+++ mplayerxp/libmpcodecs/ad_ffmp3.c	2010-01-01 09:46:55 UTC (rev 55)
@@ -126,9 +126,10 @@
         lavc_context->extradata = malloc(sh_audio->codecdata_len);
         lavc_context->extradata_size = sh_audio->codecdata_len;
         memcpy(lavc_context->extradata, (char *)sh_audio->codecdata, 
-               lavc_context->extradata_size);	
+               lavc_context->extradata_size);
     }
     lavc_context->codec_tag = sh_audio->format;
+    lavc_context->codec_type = lavc_codec->type;
     lavc_context->codec_id = lavc_codec->id;
     /* open it */
     if ((*avcodec_open_ptr)(lavc_context, lavc_codec) < 0) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.