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

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

Revision: 648
          http://sourceforge.net/p/mplayerxp/code/648
Author:   nickols_k
Date:     2013-06-04 17:51:34 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
sync with beye

Modified Paths:
--------------
    TODO
    functions
    lavc/doc/examples/pc-uninstalled/libavcodec.pc
    lavc/doc/examples/pc-uninstalled/libavformat.pc
    mplayerxp/osdep/mp_malloc.cpp

Modified: TODO
===================================================================
--- TODO	2013-05-26 12:22:56 UTC (rev 647)
+++ TODO	2013-06-04 17:51:34 UTC (rev 648)
@@ -1,5 +1,6 @@
 TODO for mplayerxp:
 
+
 - remove m_config_t from libplaytree: implement config independed container
 - Implement libmpdemux3:
     class Demuxer_Driver {

Modified: functions
===================================================================
--- functions	2013-05-26 12:22:56 UTC (rev 647)
+++ functions	2013-06-04 17:51:34 UTC (rev 648)
@@ -978,9 +978,6 @@
   ( check_cmd $cc $CFLAGS $inc_extra $ld_static $ld_extra "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1
   TMP="$?"
   echo >> "$TMPLOG"
-  echo "ldd $TMPO" >> "$TMPLOG"
-  ( ldd "$TMPO" ) >> "$TMPLOG" 2>&1
-  echo >> "$TMPLOG"
   return "$TMP"
 }
 
@@ -991,9 +988,6 @@
   ( check_cmd $cxx $CXXFLAGS $inc_extra $ld_static $ld_extra "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1
   TMP="$?"
   echo >> "$TMPLOG"
-  echo "ldd $TMPO" >> "$TMPLOG"
-  ( ldd "$TMPO" ) >> "$TMPLOG" 2>&1
-  echo >> "$TMPLOG"
   return "$TMP"
 }
 

Modified: lavc/doc/examples/pc-uninstalled/libavcodec.pc
===================================================================
--- lavc/doc/examples/pc-uninstalled/libavcodec.pc	2013-05-26 12:22:56 UTC (rev 647)
+++ lavc/doc/examples/pc-uninstalled/libavcodec.pc	2013-06-04 17:51:34 UTC (rev 648)
@@ -8,5 +8,5 @@
 Version: 54.59.100
 Requires: libavutil = 51.73.101
 Conflicts:
-Libs: -L${libdir} -lavcodec64 -ljack -lasound -Wl,-rpath,/usr/X11/lib64 -L/usr/X11/lib64 -lSDL -lpthread -lm -pthread -lbz2 -lz -lrt
+Libs: -L${libdir} -lavcodec64 -lasound -lm -pthread -lbz2 -lz
 Cflags: -I${includedir}

Modified: lavc/doc/examples/pc-uninstalled/libavformat.pc
===================================================================
--- lavc/doc/examples/pc-uninstalled/libavformat.pc	2013-05-26 12:22:56 UTC (rev 647)
+++ lavc/doc/examples/pc-uninstalled/libavformat.pc	2013-06-04 17:51:34 UTC (rev 648)
@@ -8,5 +8,5 @@
 Version: 54.29.104
 Requires: libavcodec = 54.59.100
 Conflicts:
-Libs: -L${libdir} -lavformat64 -ljack -lasound -Wl,-rpath,/usr/X11/lib64 -L/usr/X11/lib64 -lSDL -lpthread -lm -pthread -lbz2 -lz -lrt
+Libs: -L${libdir} -lavformat64 -lasound -lm -pthread -lbz2 -lz
 Cflags: -I${includedir}

Modified: mplayerxp/osdep/mp_malloc.cpp
===================================================================
--- mplayerxp/osdep/mp_malloc.cpp	2013-05-26 12:22:56 UTC (rev 647)
+++ mplayerxp/osdep/mp_malloc.cpp	2013-06-04 17:51:34 UTC (rev 648)
@@ -573,19 +573,19 @@
 any_t* operator new(size_t size) throw(std::bad_alloc) {
     any_t* rc;
     rc=SECURE_NAME0(_mp_malloc)(size);
-    if(!rc) throw std::runtime_error("Memory allocation failed");
+    if(!rc) { std::bad_alloc ba; throw ba; }
     return rc;
 }
 any_t* operator new(size_t size,const zeromemory_t&) {
     any_t* rc;
     rc=SECURE_NAME1(_mp_mallocz)(size);
-    if(!rc) throw std::runtime_error("Memory allocation failed");
+    if(!rc) { std::bad_alloc ba; throw ba; }
     return rc;
 }
 any_t* operator new(size_t size,const alignedmemory_t&,size_t boundary) {
     any_t* rc;
     rc=SECURE_NAME2(_mp_memalign)(boundary,size);
-    if(!rc) throw std::runtime_error("Memory allocation failed");
+    if(!rc) { std::bad_alloc ba; throw ba; }
     return rc;
 }
 any_t* operator new(size_t size,const std::nothrow_t&) { return mp_malloc(size); }
@@ -593,19 +593,19 @@
 any_t* operator new[](size_t size) throw(std::bad_alloc) {
     any_t* rc;
     rc=SECURE_NAME0(_mp_malloc)(size);
-    if(!rc) throw std::runtime_error("Memory allocation failed");
+    if(!rc) { std::bad_alloc ba; throw ba; }
     return rc;
 }
 any_t* operator new[](size_t size,const zeromemory_t&) {
     any_t* rc;
     rc=SECURE_NAME1(_mp_mallocz)(size);
-    if(!rc) throw std::runtime_error("Memory allocation failed");
+    if(!rc) { std::bad_alloc ba; throw ba; }
     return rc;
 }
 any_t* operator new[](size_t size,const alignedmemory_t&,size_t boundary) {
     any_t* rc;
     rc=SECURE_NAME2(_mp_memalign)(boundary,size);
-    if(!rc) throw std::runtime_error("Memory allocation failed");
+    if(!rc) { std::bad_alloc ba; throw ba; }
     return rc;
 }
 any_t* operator new[](size_t size,const std::nothrow_t&) { return mp_malloc(size); }

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