Packman Build Service PMBS

MPlayer.changes Changed

MPlayer.spec Changed

@@ -24,169 +24,9 @@
 %define blue_version        1.11
 %define clearlooks_version  1.7
 
-%define build_optimization 0
-%define build_debug        0
-%define build_mencoder     1
-%define build_gui          1
-%define build_yasm         1
-%define build_live         1
-%define build_theora       1
-%define build_lirc         1
-%define	build_xmms         0
-%define	build_arts         0
-%define build_aa           1
-%define build_cdda         1
-%define build_compiz       0
-%define build_dv           1
-%define build_sdl          1
-%define build_lzo          1
-%define build_smb          1
-%define build_mga          0
-%define build_fbdev        1
-%define build_dvb          1
-%define build_fribidi      1
-%define build_enca         1
-%define build_alsa         1
-%define build_jack         1
-%define build_openal       0
-%define build_pulse        1
-%define build_twolame      1
-%define build_lame         1
-%define build_opus         1
-%define build_faac         1
-%define build_faad         1
-%define build_mpeg2        1
-%define build_x264         1
-%define build_xvid         1
-%define build_dts          1
-%define build_v4l2         1
-%define build_xvmc         1
-%define build_vdpau        1
-%define build_libass       1
-%define build_rtmp         1
-%define build_zr           0
-# the nut-devel used in this spec file is actually a UPS tool:
-# # zypper se nut-devel
-# S | Name      | Summary                                                 | Type
-# --+-----------+---------------------------------------------------------+--------
-#   | nut-devel | Network UPS Tools (Unbreakable Power Supply Monitoring) | package
-# I'm quite sure we don't need that for MPlayer -- seife+obs@b1-systems.com
-%define build_libnut       0
-%define build_radio        1
-%define build_vstream      0
-%define build_bluray       1
-%define build_vorbis       1
-
-%ifarch %ix86 x86_64
-%define build_crystalhd    1
-%else
-%define build_crystalhd    0
-%endif
-
-## the following codecs require a static build of ffmpeg
-%define build_amr          0
-%define build_dirac        0
-%define build_schroedinger 0
-## dynamic linking to libvpx is irrelevant when using dynamic ffmpeg
-%define build_vpx          0
-
-%{?_with_amr: %{expand: %%global build_amr 1}}
-%{?_without_amr: %{expand: %%global build_amr 0}}
-%{?_with_live: %{expand: %%global build_live 1}}
-%{?_without_live: %{expand: %%global build_live 0}}
-%{?_with_yasm: %{expand: %%global build_yasm 1}}
-%{?_without_yasm: %{expand: %%global build_yasm 0}}
-%{?_with_optimization: %{expand: %%global build_optimization 1}}
-%{?_without_optimization: %{expand: %%global build_optimization 0}}
-%{?_with_debug: %{expand: %%global build_debug 1}}
-%{?_without_debug: %{expand: %%global build_debug 0}}
-%{?_with_mencoder: %{expand: %%global build_mencoder 1}}
-%{?_without_mencoder: %{expand: %%global build_mencoder 0}}
-%{?_with_gui: %{expand: %%global build_gui 1}}
-%{?_without_gui: %{expand: %%global build_gui 0}}
-%{?_with_theora: %{expand: %%global build_theora 1}}
-%{?_without_theora: %{expand: %%global build_theora 0}}
-%{?_with_smb: %{expand: %%global build_smb 1}}
-%{?_without_smb: %{expand: %%global build_smb 0}}
-%{?_with_lirc: %{expand: %%global build_lirc 1}}
-%{?_without_lirc: %{expand: %%global build_lirc 0}}
-%{?_with_xmms: %{expand: %%global build_xmms 1}}
-%{?_without_xmms: %{expand: %%global build_xmms 0}}
-%{?_with_arts: %{expand: %%global build_arts 1}}
-%{?_without_arts: %{expand: %%global build_arts 0}}
-%{?_with_aa: %{expand: %%global build_aa 1}}
-%{?_without_aa: %{expand: %%global build_aa 0}}
-%{?_with_cdda: %{expand: %%global build_cdda 1}}
-%{?_without_cdda: %{expand: %%global build_cdda 0}}
-%{?_with_compiz: %{expand: %%global build_compiz 1}}
-%{?_without_compiz: %{expand: %%global build_compiz 0}}
-%{?_with_dirac: %{expand: %%global build_dirac 1}}
-%{?_without_dirac: %{expand: %%global build_dirac 0}}
-%{?_with_dv: %{expand: %%global build_dv 1}}
-%{?_without_dv: %{expand: %%global build_dv 0}}
-%{?_with_sdl: %{expand: %%global build_sdl 1}}
-%{?_without_sdl: %{expand: %%global build_sdl 0}}
-%{?_with_lzo: %{expand: %%global build_lzo 1}}
-%{?_without_lzo: %{expand: %%global build_lzo 0}}
-%{?_with_mga: %{expand: %%global build_mga 1}}
-%{?_without_mga: %{expand: %%global build_mga 0}}
-%{?_with_fribidi: %{expand: %%global build_fribidi 1}}
-%{?_without_fribidi: %{expand: %%global build_fribidi 0}}
-%{?_with_enca: %{expand: %%global build_enca 1}}
-%{?_without_enca: %{expand: %%global build_enca 0}}
-%{?_with_jack: %{expand: %%global build_jack 1}}
-%{?_without_jack: %{expand: %%global build_jack 0}}
-%{?_with_libass: %{expand: %%global build_libass 1}}
-%{?_without_libass: %{expand: %%global build_libass 0}}
-%{?_with_pulse: %{expand: %%global build_pulse 1}}
-%{?_without_pulse: %{expand: %%global build_pulse 0}}
-%{?_with_openal: %{expand: %%global build_openal 1}}
-%{?_without_openal: %{expand: %%global build_openal 0}}
-%{?_with_schroedinger: %{expand: %%global build_schroedinger 1}}
-%{?_without_schroedinger: %{expand: %%global build_schroedinger 0}}
-%{?_with_twolame: %{expand: %%global build_twolame 1}}
-%{?_without_twolame: %{expand: %%global build_twolame 0}}
-%{?_with_lame: %{expand: %%global build_lame 1}}
-%{?_without_lame: %{expand: %%global build_lame 0}}
-%{?_with_opus: %{expand: %%global build_opus 1}}
-%{?_without_opus: %{expand: %%global build_opus 0}}
-%{?_with_faac: %{expand: %%global build_faac 1}}
-%{?_without_faac: %{expand: %%global build_faac 0}}
-%{?_with_faad: %{expand: %%global build_faad 1}}
-%{?_without_faad: %{expand: %%global build_faad 0}}
-%{?_with_mpeg2: %{expand: %%global build_mpeg2 1}}
-%{?_without_mpeg2: %{expand: %%global build_mpeg2 0}}
-%{?_with_x264: %{expand: %%global build_x264 1}}
-%{?_without_x264: %{expand: %%global build_x264 0}}
-%{?_with_xvid: %{expand: %%global build_xvid 1}}
-%{?_without_xvid: %{expand: %%global build_xvid 0}}
-%{?_with_dts: %{expand: %%global build_dts 1}}
-%{?_without_dts: %{expand: %%global build_dts 0}}
-%{?_with_rtmp: %{expand: %%global build_rtmp 1}}
-%{?_without_rtmp: %{expand: %%global build_rtmp 0}}
-%{?_with_v4l2: %{expand: %%global build_v4l2 1}}
-%{?_without_v4l2: %{expand: %%global build_v4l2 0}}
-%{?_with_xvmc: %{expand: %%global build_xvmc 1}}
-%{?_without_xvmc: %{expand: %%global build_xvmc 0}}
-%{?_with_vdpau: %{expand: %%global build_vdpau 1}}
-%{?_without_vdpau: %{expand: %%global build_vdpau 0}}
-%{?_with_vpx: %{expand: %%global build_vpx 1}}
-%{?_without_vpx: %{expand: %%global build_vpx 0}}
-%{?_with_libnut: %{expand: %%global build_libnut 1}}
-%{?_without_libnut: %{expand: %%global build_libnut 0}}
-%{?_with_radio: %{expand: %%global build_radio 1}}
-%{?_without_radio: %{expand: %%global build_radio 0}}
-%{?_with_bluray: %{expand: %%global build_bluray 1}}
-%{?_without_bluray: %{expand: %%global build_bluray 0}}
-%{?_with_crystalhd: %{expand: %%global build_crystalhd 1}}
-%{?_without_crystalhd: %{expand: %%global build_crystalhd 0}}
-%{?_with_vstream: %{expand: %%global build_vstream 1}}
-%{?_without_vstream: %{expand: %%global build_vstream 0}}
-%{?_with_vorbis: %{expand: %%global build_vorbis 1}}
-%{?_without_vorbis: %{expand: %%global build_vorbis 0}}
 
 Name:           MPlayer
-Version:        1.2.r38170
+Version:        1.2.r38304
 Release:        0
 License:        GPL-2.0+
 Summary:        Multimedia Player
@@ -227,192 +67,52 @@
 BuildRequires:  pkgconfig(libswresample)
 BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(libpostproc)
-
-%if %build_aa
 BuildRequires:  aalib-devel
-%endif
-
-%if %build_arts
-BuildRequires:  arts-devel
-%endif
-
-%if %build_amr
-BuildRequires:  libopencore-amr-devel
-%endif
-
-%if %build_jack
-BuildRequires:  libjack-devel
-%endif
-
-%if %build_pulse
+BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(libpulse) >= 0.9
-%endif
-
-%if %build_openal
-BuildRequires:  openal-soft-devel
-%endif

60_arm-private-symbols.patch Changed

@@ -1,5 +1,5 @@
---- libmpeg2/motion_comp_arm_s.S.orig	2013-11-05 01:11:11.591763316 +0100
-+++ libmpeg2/motion_comp_arm_s.S	2013-11-05 01:11:11.621762718 +0100
+--- a/libmpeg2/motion_comp_arm_s.S
++++ b/libmpeg2/motion_comp_arm_s.S
 @@ -23,7 +23,8 @@
  
  @ ----------------------------------------------------------------
@@ -10,7 +10,7 @@
  MC_put_o_16_arm:
  	@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
  	pld [r1]
-@@ -83,7 +84,8 @@
+@@ -83,7 +84,8 @@ MC_put_o_16_arm_align_jt:
  
  @ ----------------------------------------------------------------
  	.align
@@ -20,7 +20,7 @@
  MC_put_o_8_arm:
  	@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
  	pld [r1]
-@@ -152,7 +154,8 @@
+@@ -152,7 +154,8 @@ MC_put_o_8_arm_align_jt:
  .endm
  
  	.align
@@ -30,7 +30,7 @@
  MC_put_x_16_arm:
  	@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
  	pld [r1]
-@@ -244,7 +247,8 @@
+@@ -244,7 +247,8 @@ MC_put_x_16_arm_align_jt:
  
  @ ----------------------------------------------------------------
  	.align

MPlayer-1.0rc4-distro-config.patch Changed

MPlayer-1.0rc4-warn.patch Changed

@@ -1,6 +1,16 @@
---- loader/ext.c.orig	2013-11-05 00:05:32.118778962 +0100
-+++ loader/ext.c	2013-11-05 00:05:32.148778361 +0100
-@@ -444,7 +444,7 @@
+--- a/libmpdemux/demuxer.c
++++ b/libmpdemux/demuxer.c
+@@ -37,6 +37,7 @@
+ 
+ #include "stream/stream.h"
+ #include "demuxer.h"
++#include "demux_rtp.h"
+ #include "stheader.h"
+ #include "mf.h"
+ #include "demux_audio.h"
+--- a/loader/ext.c
++++ b/loader/ext.c
+@@ -444,7 +444,7 @@ LPVOID WINAPI VirtualAlloc(LPVOID addres
  
      if (type&MEM_RESERVE && (unsigned)address&0xffff) {
  	size += (unsigned)address&0xffff;
@@ -9,9 +19,9 @@
      }
      pgsz = sysconf(_SC_PAGESIZE);
      if (type&MEM_COMMIT && (unsigned)address%pgsz) {
---- mencoder.c.orig	2013-11-05 00:05:34.196737387 +0100
-+++ mencoder.c	2013-11-05 00:05:34.228736747 +0100
-@@ -247,7 +247,7 @@
+--- a/mencoder.c
++++ b/mencoder.c
+@@ -246,7 +246,7 @@ static int edl_seek_type; ///< When non-
  
  
  /* FIXME */
@@ -20,13 +30,3 @@
  {
      if (how)
  	mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ExitingHow, how);
---- libmpdemux/demuxer.c.orig	2013-11-05 00:05:36.346694372 +0100
-+++ libmpdemux/demuxer.c	2013-11-05 00:05:36.374693811 +0100
-@@ -38,6 +38,7 @@
- 
- #include "stream/stream.h"
- #include "demuxer.h"
-+#include "demux_rtp.h"
- #include "stheader.h"
- #include "mf.h"
- #include "demux_audio.h"

MPlayer-amd64-detection.patch Changed

MPlayer-bypass_live_detection.patch Changed

@@ -12,8 +12,81 @@
  libmpdemux/demux_rtp.cpp | 51 ++++++++++++++++++++++++++++++++----------------
  2 files changed, 35 insertions(+), 22 deletions(-)
 
---- libmpdemux/demux_rtp.cpp.orig
-+++ libmpdemux/demux_rtp.cpp
+--- a/configure
++++ b/configure
+@@ -7358,58 +7358,21 @@ fi
+ echores "$_nemesi"
+ 
+ echocheck "LIVE555 Streaming Media libraries"
+-if test "$_live" = auto  && test "$networking" = yes ; then
+-  cat > $TMPCPP << EOF
+-#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
+-#include <liveMedia.hh>
+-#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600)
+-#error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
+-#endif
+-#include "BasicUsageEnvironment.hh"
+-int main(void) { RTSPClient::createNew(*BasicUsageEnvironment::createNew(*BasicTaskScheduler::createNew()), 0, "", 0); return 0; }
+-EOF
+-
+-  _live=no
+-  for I in $extra_cflags "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do
+-    _livelibdir=$(echo $I| sed s/-I//)
+-    inc_tmp="-I$_livelibdir/liveMedia/include \
+-             -I$_livelibdir/UsageEnvironment/include \
+-             -I$_livelibdir/BasicUsageEnvironment/include \
+-             -I$_livelibdir/groupsock/include"
+-    ld_tmp="$_livelibdir/liveMedia/libliveMedia.a \
+-            $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
+-            $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
+-            $_livelibdir/groupsock/libgroupsock.a \
+-            -lstdc++ $ld_sock"
+-    test -e "$_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a" &&
+-        cxx_check $inc_tmp $ld_tmp &&
+-      extra_ldflags="$ld_tmp $extra_ldflags" &&
+-      extra_cxxflags="$inc_tmp" &&
+-      _live=yes && break
+-  done
+-  if test "$_live" != yes ; then
+-      for ld_tmp in "-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment -lstdc++" "-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic -lstdc++" ; do
+-          inc_tmp="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
+-          cxx_check $inc_tmp $ld_tmp && _live_dist=yes && break
+-      done
+-  fi
++_live=yes
++inc_tmp=$($_pkg_config --cflags live555)
++ld_tmp=$($_pkg_config --libs live555)
++if test -n "$ld_tmp" ; then
++extra_ldflags="$extra_ldflags -lstdc++ $ld_tmp"
++else
++extra_ldflags="$_libdir/live/libliveMedia.a $_libdir/live/libUsageEnvironment.a $_libdir/live/libBasicUsageEnvironment.a $_libdir/live/libgroupsock.a -lstdc++ $extra_ldflags"
+ fi
+-if test "$_live" = yes && test "$networking" = yes; then
+-  test $_livelibdir && res_comment="using $_livelibdir"
+-  def_live='#define CONFIG_LIVE555 1'
+- inputmodules="live555 $inputmodules"
+-elif test "$_live_dist" = yes && test "$networking" = yes; then
+-  res_comment="using distribution version"
+-  _live="yes"
+-  def_live='#define CONFIG_LIVE555 1'
+-  extra_ldflags="$extra_ldflags $ld_tmp"
+-  extra_cxxflags="$inc_tmp"
+- inputmodules="live555 $inputmodules"
++if test -n "$inc_tmp" ; then
++extra_cxxflags="$extra_cxxflags $inc_tmp"
+ else
+-  _live=no
+-  def_live='#undef CONFIG_LIVE555'
+-  noinputmodules="live555 $noinputmodules"
++extra_cxxflags="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment/ -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock $extra_cxxflags"
+ fi
++def_live='#define CONFIG_LIVE555 1'
++inputmodules="live555 $inputmodules"
+ echores "$_live"
+ 
+ echocheck "RTMPDump Streaming Media library"
+--- a/libmpdemux/demux_rtp.cpp
++++ b/libmpdemux/demux_rtp.cpp
 @@ -19,8 +19,6 @@
   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -119,76 +192,3 @@
    } else if (rtpState->sipClient != NULL) {
      rtpState->sipClient->sendBYE();
    }
---- configure.orig
-+++ configure
-@@ -7125,58 +7125,21 @@ fi
- echores "$_nemesi"
- 
- echocheck "LIVE555 Streaming Media libraries"
--if test "$_live" = auto  && test "$networking" = yes ; then
--  cat > $TMPCPP << EOF
--#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
--#include <liveMedia.hh>
--#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600)
--#error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
--#endif
--#include "BasicUsageEnvironment.hh"
--int main(void) { RTSPClient::createNew(*BasicUsageEnvironment::createNew(*BasicTaskScheduler::createNew()), 0, "", 0); return 0; }
--EOF
--
--  _live=no
--  for I in $extra_cflags "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do
--    _livelibdir=$(echo $I| sed s/-I//)
--    inc_tmp="-I$_livelibdir/liveMedia/include \
--             -I$_livelibdir/UsageEnvironment/include \
--             -I$_livelibdir/BasicUsageEnvironment/include \
--             -I$_livelibdir/groupsock/include"
--    ld_tmp="$_livelibdir/liveMedia/libliveMedia.a \
--            $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
--            $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
--            $_livelibdir/groupsock/libgroupsock.a \
--            -lstdc++ $ld_sock"
--    test -e "$_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a" &&
--        cxx_check $inc_tmp $ld_tmp &&
--      extra_ldflags="$ld_tmp $extra_ldflags" &&
--      extra_cxxflags="$inc_tmp" &&
--      _live=yes && break
--  done
--  if test "$_live" != yes ; then
--      for ld_tmp in "-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment -lstdc++" "-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic -lstdc++" ; do
--          inc_tmp="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
--          cxx_check $inc_tmp $ld_tmp && _live_dist=yes && break
--      done
--  fi
-+_live=yes
-+inc_tmp=$($_pkg_config --cflags live555)
-+ld_tmp=$($_pkg_config --libs live555)
-+if test -n "$ld_tmp" ; then
-+extra_ldflags="$extra_ldflags -lstdc++ $ld_tmp"
-+else
-+extra_ldflags="$_libdir/live/libliveMedia.a $_libdir/live/libUsageEnvironment.a $_libdir/live/libBasicUsageEnvironment.a $_libdir/live/libgroupsock.a -lstdc++ $extra_ldflags"
- fi
--if test "$_live" = yes && test "$networking" = yes; then
--  test $_livelibdir && res_comment="using $_livelibdir"
--  def_live='#define CONFIG_LIVE555 1'
-- inputmodules="live555 $inputmodules"
--elif test "$_live_dist" = yes && test "$networking" = yes; then
--  res_comment="using distribution version"
--  _live="yes"
--  def_live='#define CONFIG_LIVE555 1'
--  extra_ldflags="$extra_ldflags $ld_tmp"
--  extra_cxxflags="$inc_tmp"
-- inputmodules="live555 $inputmodules"
-+if test -n "$inc_tmp" ; then
-+extra_cxxflags="$extra_cxxflags $inc_tmp"
- else
--  _live=no
--  def_live='#undef CONFIG_LIVE555'
--  noinputmodules="live555 $noinputmodules"
-+extra_cxxflags="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment/ -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock $extra_cxxflags"
- fi
-+def_live='#define CONFIG_LIVE555 1'
-+inputmodules="live555 $inputmodules"
- echores "$_live"
- 
- echocheck "RTMPDump Streaming Media library"

MPlayer-codec-cfg_optflags.patch Changed

MPlayer-column_fidct_mmx.patch Changed

MPlayer-coverity_shebang.patch Changed

MPlayer-fix-dvd-crash.patch Changed

MPlayer-fix_tcp_pointer_casts.patch Changed

MPlayer-fix_vd_ffmpeg_pointer_casts.patch Changed

MPlayer-fix_win32_pointer_casts.patch Changed

MPlayer-libopus_support.patch Changed

@@ -1,6 +1,6 @@
---- gui/dialog/fileselect.c.orig	2017-01-31 20:28:48.125434378 +0100
-+++ gui/dialog/fileselect.c	2017-01-31 20:30:34.529568764 +0100
-@@ -72,15 +72,15 @@
+--- a/gui/dialog/fileselect.c
++++ b/gui/dialog/fileselect.c
+@@ -80,7 +80,7 @@ char * const fsVideoAudioFilterNames[][2
      { MSGTR_GUI_FilterFileMPEG,           "*.m1v,*.m2v,*.mp2,*.mpe,*.mpeg,*.mpg,*.mpga,*.vdr,*.vob"                                                                                                                                                                                                                                                                                                                                                                },
      { MSGTR_GUI_FilterFileMP2TS,          "*.bdm,*.bdmv,*.clpi,*.cpi,*.m2t,*.m2ts,*.mpl,*.mpls,*.mts,*.rec,*.trp,*.ts,*.ty"                                                                                                                                                                                                                                                                                                                                        },
      { MSGTR_GUI_FilterMediumMatroska,     "*.mka,*.mkv"                                                                                                                                                                                                                                                                                                                                                                                                            },
@@ -9,7 +9,7 @@
      { MSGTR_GUI_FilterMediumQuickTime,    "*.moov,*.mov,*.qt,*.qtvr"                                                                                                                                                                                                                                                                                                                                                                                               },
      { MSGTR_GUI_FilterMediumRealNetworks, "*.ra,*.rm,*.rmvb,*.rv"                                                                                                                                                                                                                                                                                                                                                                                                  },
      { MSGTR_GUI_FilterImageCue,           "*.cue"                                                                                                                                                                                                                                                                                                                                                                                                                  },
-     { MSGTR_GUI_FilterFileWav,            "*.wav"                                                                                                                                                                                                                                                                                                                                                                                                                  },
+@@ -88,7 +88,7 @@ char * const fsVideoAudioFilterNames[][2
      { MSGTR_GUI_FilterMediumWindows,      "*.asf,*.wma,*.wmv"                                                                                                                                                                                                                                                                                                                                                                                                      },
      { MSGTR_GUI_FilterFilePlaylist,       "*.asx,*.m3u,*.m3u8,*.m4u,*.mxu,*.nsc,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx"                                                                                                                                                                                                                                                                                                                            },
      { MSGTR_GUI_FilterAudioVideo,         "*.aac,*.ac3,*.ape,*.au,*.avi,*.divx,*.flac,*.flv,*.m2v,*.m4a,*.m4v,*.mjpg,*.mkv,*.mov,*.mp3,*.mp4,*.mpe,*.mpeg,*.mpg,*.ogg,*.rec,*.rm,*.ts,*.vob,*.wav,*.webm,*.wma,*.wmv"                                                                                                                                                                                                                                              },
@@ -18,7 +18,7 @@
      { MSGTR_GUI_FilterVideoAll,           "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.apng,*.asf,*.avi,*.bdm,*.bdmv,*.clpi,*.cpi,*.cpk,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mjpg,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.roq,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv,*.y4m" },
      { MSGTR_GUI_FilterFileAll,            "*"                                                                                                                                                                                                                                                                                                                                                                                                                      },
      { NULL,                               NULL                                                                                                                                                                                                                                                                                                                                                                                                                     }
-@@ -107,10 +107,10 @@
+@@ -116,10 +116,10 @@ char * const fsAudioFileNames[][2] = {
      { MSGTR_GUI_FilterAudioDolbyPCM, "*.ac3,*.pcm"                                                                          },
      { MSGTR_GUI_FilterAudioMPEG,     "*.aac,*.f4a,*.m4a,*.mp2,*.mp3,*.mpga"                                                 },
      { MSGTR_GUI_FilterAudioMatroska, "*.mka"                                                                                },

MPlayer-linking_dvdread.patch Changed

MPlayer-pci_linux_gnu_source.patch Changed

MPlayer-rtsp-extra-fixes.patch Changed

MPlayer-samba4-include-path.patch Changed

MPlayer-vdpau.patch Changed

MPlayer-ve_lavc-intptr.patch Changed

bug490-demux_lavf.patch Changed

MPlayer-1.2.r38170.tar.xz/Changelog -> MPlayer-1.2.r38304.tar.xz/Changelog Changed

@@ -8,7 +8,24 @@
     * Fix wrongly sized video window after leaving fullscreen mode
     * Clear screen when switching to fullscreen mode using the x11
       video output driver
-    * Enable video output drivers which write to files
+    * Command line option -fs is now recognized in addition to the
+      GUI option load_fullscreen
+    * Use correct visual in OpenGL video output driver for X11
+    * Provide a built-in skin so that the GUI can be used even
+      without an installed skin
+    * Native Language Support, i.e. the GUI language can be changed
+      as specified in LC_MESSAGES or LANG
+    * Minor bug fixes
+
+    Other:
+    * Building on Arm now compiles for the ISA and extensions of the
+      host CPU by default. This should avoid issues like builds on
+      e.g. Raspbian not using NEON by default.
+      Can use --enable-runtime-cpudetection to restore the previous
+      behaviour, though full runtime CPU detection is not supported.
+    * New configure option --enable-nls for Native Language Support at
+      runtime (for the moment only for the GUI and enabled by default
+      for it)
 
   1.4: "SubCounter" April 18, 2019

MPlayer-1.2.r38170.tar.xz/DOCS/man/cs/mplayer.1 -> MPlayer-1.2.r38304.tar.xz/DOCS/man/cs/mplayer.1 Changed

MPlayer-1.2.r38170.tar.xz/DOCS/man/de/mplayer.1 -> MPlayer-1.2.r38304.tar.xz/DOCS/man/de/mplayer.1 Changed

@@ -1,4 +1,4 @@
-.\" MPlayer (C) 2000-2020 MPlayer Team
+.\" MPlayer (C) 2000-2021 MPlayer Team
 .\" Diese Man-Page wurde/wird von Moritz Bunkus, Sebastian Krämer,
 .\" Tobias Diedrich gepflegt.
 .\"
@@ -33,7 +33,7 @@
 .\" Titel
 .\" --------------------------------------------------------------------------
 .
-.TH MPlayer 1 "09.03.2019" "Das MPlayer Projekt"
+.TH MPlayer 1 "04.02.2020" "Das MPlayer Projekt"
 .
 .SH NAME
 mplayer  \- Movie Player
@@ -622,7 +622,6 @@
 gui_tv_digital (ja/nein),
 gui_video_out_pos_x,
 gui_video_out_pos_y,
-load_fullscreen  (ja/nein),
 playbar (aktiviert/deaktiviert),
 replay_gain (aktiviert/deaktiviert),
 replay_gain_adjustment (-30..10),
@@ -671,6 +670,8 @@
 .RB ( skin ),
 idle
 .RB ( idle ),
+load_fullscreen
+.RB ( fs ),
 osd_level
 .RB ( osdlevel ),
 playlist_support
@@ -11962,7 +11963,7 @@
 MPlayer wurde ursprünglich von Arpad Gereöffy geschrieben.
 Siehe Datei AUTHORS für eine Liste einiger der vielen anderen Beitragenden.
 .PP
-MPlayer is (C) 2000\-2020 The MPlayer Team
+MPlayer is (C) 2000\-2021 The MPlayer Team
 .PP
 Diese Manpage wurde zum größten Teil von Gabucino, Diego Biurrun und
 Jonas Jermann geschrieben und von Moritz Bunkus und Sebastian Krämer

MPlayer-1.2.r38170.tar.xz/DOCS/man/en/mplayer.1 -> MPlayer-1.2.r38304.tar.xz/DOCS/man/en/mplayer.1 Changed

@@ -1,5 +1,5 @@
-.\" $Revision: 38159 $
-.\" MPlayer (C) 2000-2020 MPlayer Team
+.\" $Revision: 38214 $
+.\" MPlayer (C) 2000-2021 MPlayer Team
 .\" This man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
 .
 .\" --------------------------------------------------------------------------
@@ -31,7 +31,7 @@
 .\" Title
 .\" --------------------------------------------------------------------------
 .
-.TH MPlayer 1 "2019-03-09" "The MPlayer Project" "The Movie Player"
+.TH MPlayer 1 "2020-02-04" "The MPlayer Project" "The Movie Player"
 .
 .SH NAME
 mplayer  \- movie player
@@ -606,7 +606,6 @@
 gui_tv_digital (yes/no),
 gui_video_out_pos_x,
 gui_video_out_pos_y,
-load_fullscreen  (yes/no),
 playbar (enable/disable),
 replay_gain (enable/disable),
 replay_gain_adjustment (-30..10),
@@ -655,6 +654,8 @@
 .RB ( skin ),
 idle
 .RB ( idle ),
+load_fullscreen
+.RB ( fs ),
 osd_level
 .RB ( osdlevel ),
 playlist_support
@@ -1811,6 +1812,10 @@
 It will still be used for IPv4 connections.
 .
 .TP
+.B \-lavfstreamopts <options>
+Specify extra options for libavformat based streams.
+.
+.TP
 .B \-loadidx <index file>
 The file from which to read the video index data saved by \-saveidx.
 This index will be used for seeking, overriding any index data
@@ -5400,6 +5405,11 @@
 .RE
 .
 .TP
+.B \-swsopts <software scaler options>
+Specify advanced software scaler options provided by libswscale.
+Set to "help" to get a list of supported options.
+.
+.TP
 .B \-vc <[\-|+]codec1,[\-|+]codec2,...[,]>
 Specify a priority list of video codecs to be used, according to their codec
 name in codecs.conf.
@@ -12428,7 +12438,7 @@
 MPlayer was initially written by Arpad Gereoffy.
 See the AUTHORS file for a list of some of the many other contributors.
 .PP
-MPlayer is (C) 2000\-2020 The MPlayer Team
+MPlayer is (C) 2000\-2021 The MPlayer Team
 .PP
 This man page was written mainly by Gabucino, Jonas Jermann and Diego Biurrun.
 It is maintained by Diego Biurrun.

MPlayer-1.2.r38170.tar.xz/DOCS/man/es/mplayer.1 -> MPlayer-1.2.r38304.tar.xz/DOCS/man/es/mplayer.1 Changed

MPlayer-1.2.r38170.tar.xz/DOCS/man/fr/mplayer.1 -> MPlayer-1.2.r38304.tar.xz/DOCS/man/fr/mplayer.1 Changed

MPlayer-1.2.r38170.tar.xz/DOCS/man/hu/mplayer.1 -> MPlayer-1.2.r38304.tar.xz/DOCS/man/hu/mplayer.1 Changed

MPlayer-1.2.r38170.tar.xz/DOCS/man/it/mplayer.1 -> MPlayer-1.2.r38304.tar.xz/DOCS/man/it/mplayer.1 Changed

MPlayer-1.2.r38170.tar.xz/DOCS/man/pl/mplayer.1 -> MPlayer-1.2.r38304.tar.xz/DOCS/man/pl/mplayer.1 Changed

MPlayer-1.2.r38170.tar.xz/DOCS/man/ru/mplayer.1 -> MPlayer-1.2.r38304.tar.xz/DOCS/man/ru/mplayer.1 Changed

MPlayer-1.2.r38170.tar.xz/DOCS/man/zh_CN/mplayer.1 -> MPlayer-1.2.r38304.tar.xz/DOCS/man/zh_CN/mplayer.1 Changed

MPlayer-1.2.r38170.tar.xz/DOCS/xml/cs/documentation.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/cs/documentation.xml Changed

MPlayer-1.2.r38170.tar.xz/DOCS/xml/de/documentation.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/de/documentation.xml Changed

MPlayer-1.2.r38170.tar.xz/DOCS/xml/de/install.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/de/install.xml Changed

@@ -235,8 +235,8 @@
     </para>
 
     <para>
-      Da <application>MPlayer</application> kein Skin mitbringt, musst du zumindest eines
-      herunterladen, um die GUI benutzen zu können. Siehe dazu Skins auf der
+      Um die GUI auf komfortable Weise und wie vorgesehen zu benutzen,
+      solltest du unbedingt ein Skin installieren. Siehe dazu Skins auf der
       <ulink url="http://www.mplayerhq.hu/dload.html">Download-Seite</ulink>.
       Ein Skin sollte in das normale systemweite Verzeichnis
       <filename class="directory">$PREFIX/share/mplayer/skins</filename> oder in das
@@ -247,7 +247,8 @@
       Unterverzeichnis mit dem Namen <filename class="directory">default</filename>
       (das einfach ein Link auf das Lieblingsskin sein kann), um das Skin zu laden.
       Du kannst aber auch die Option <option>-skin <replaceable>meinskin</replaceable></option>
-      oder die Konfigurationsdateianweisung <literal>skin=meinskin</literal> benutzen,
+      oder die Konfigurationsdateianweisungen <literal>skin=meinskin</literal>
+      oder <literal>gui_skin=meinskin</literal> oder aber den Skinbrowser benutzen,
       um ein anderes Skin aus den <filename class="directory">skins</filename>-Verzeichnissen
       zu verwenden.
     </para>

MPlayer-1.2.r38170.tar.xz/DOCS/xml/de/skin.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/de/skin.xml Changed

MPlayer-1.2.r38170.tar.xz/DOCS/xml/en/documentation.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/en/documentation.xml Changed

MPlayer-1.2.r38170.tar.xz/DOCS/xml/en/install.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/en/install.xml Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+
 <chapter id="install">
 <title>Installation</title>
 
@@ -193,8 +193,8 @@
 </para>
 
 <para>
-As <application>MPlayer</application> doesn't have a skin included, you
-have to download at least one if you want to use the GUI. See Skins at the <ulink
+In order to use the GUI in a comfortable way and as intended, you are
+strongly advised to install a skin. See Skins at the <ulink
 url="http://www.mplayerhq.hu/dload.html">download page</ulink>.
 A skin should be extracted to the usual system-wide directory <filename
 class="directory">$PREFIX/share/mplayer/skins</filename> or to the user
@@ -205,7 +205,8 @@
 <filename class="directory">default</filename> (which
 simply can be a link to your favourite skin) to load the skin, but
 you can use the <option>-skin <replaceable>myskin</replaceable></option>
-option, or the <literal>skin=myskin</literal> config file directive to use
+option, or the <literal>skin=myskin</literal> or <literal>gui_skin=myskin
+</literal> config file directives, or the skin browser to use
 a different skin from the <filename class="directory">skins</filename>
 directories.
 </para>

MPlayer-1.2.r38170.tar.xz/DOCS/xml/es/documentation.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/es/documentation.xml Changed

MPlayer-1.2.r38170.tar.xz/DOCS/xml/fr/documentation.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/fr/documentation.xml Changed

MPlayer-1.2.r38170.tar.xz/DOCS/xml/hu/documentation.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/hu/documentation.xml Changed

MPlayer-1.2.r38170.tar.xz/DOCS/xml/it/documentation.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/it/documentation.xml Changed

MPlayer-1.2.r38170.tar.xz/DOCS/xml/pl/documentation.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/pl/documentation.xml Changed

MPlayer-1.2.r38170.tar.xz/DOCS/xml/ru/documentation.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/ru/documentation.xml Changed

MPlayer-1.2.r38170.tar.xz/DOCS/xml/zh_CN/documentation.xml -> MPlayer-1.2.r38304.tar.xz/DOCS/xml/zh_CN/documentation.xml Changed

MPlayer-1.2.r38170.tar.xz/Makefile -> MPlayer-1.2.r38304.tar.xz/Makefile Changed

@@ -24,7 +24,8 @@
 ###### variable declarations #######
 
 # local fallbacks for missing operating system features
-OS_FEATURE-$(GETTIMEOFDAY)           += osdep/gettimeofday.c
+# the fallback for gettimeofday should actually no longet be needed
+#OS_FEATURE-$(GETTIMEOFDAY)           += osdep/gettimeofday.c
 OS_FEATURE-$(GLOB_WIN)               += osdep/glob-win.c
 OS_FEATURE-$(MMAP)                   += osdep/mmap-os2.c
 OS_FEATURE-$(SETENV)                 += osdep/setenv.c
@@ -666,7 +667,7 @@
 ALL_PRG-$(MPLAYER)  += mplayer$(EXESUF)
 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
 
-INSTALL_TARGETS-$(GUI)      += install-gui
+INSTALL_TARGETS-$(GUI)      += install-gui install-gui-man
 INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man
 INSTALL_TARGETS-$(MPLAYER)  += install-mplayer  install-mplayer-man
 
@@ -710,28 +711,30 @@
 ADD_ALL_DIRS    = $(call ADDSUFFIXES,$(1),$(ALL_DIRS))
 ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1))
 
+ALL_MSGS = $(foreach lang,$(filter-out $(firstword $(MSG_LANGS)),$(MSG_LANGS)),help/po/$(lang).mo)
+
 GUI_ICONSIZES = 16x16 22x22 24x24 32x32 48x48 256x256
 
 
 
 ###### generic rules #######
 
-all: $(ALL_PRG-yes)
+all: $(ALL_PRG-yes) $(ALL_MSGS)
 
 %.o: %.S
-	$(CC) $(CC_DEPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CC_DEPFLAGS) $(CFLAGS) $(AS_C) $(AS_O) $<
 
 %.o: %.c
-	$(CC) $(CC_DEPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CC_DEPFLAGS) $(CFLAGS) $(CC_C) $(CC_O) $<
 
 %.o: %.cpp
-	$(CC) $(CC_DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
+	$(CC) $(CC_DEPFLAGS) $(CXXFLAGS) $(CXX_C) $(CXX_O) $<
 
 %.o: %.m
-	$(CC) $(CC_DEPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CC_DEPFLAGS) $(CFLAGS) $(CC_C) $(CC_O) $<
 
 %-rc.o: %.rc
-	$(WINDRES) -I. $< -o $@
+	$(WINDRES) -I. $(WINDRES_O) $<
 
 ffmpeglibs: $(FFMPEGLIBS)
 
@@ -743,7 +746,7 @@
 mplayer$(EXESUF): $(MPLAYER_DEPS)
 mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER)
 mencoder$(EXESUF) mplayer$(EXESUF):
-	$(CC) -o $@ $^ $(EXTRALIBS)
+	$(CC) $(CC_LINK_O) $^ $(EXTRALIBS)
 
 codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
 codec-cfg$(EXESUF) codecs2html$(EXESUF):  HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
@@ -765,21 +768,30 @@
 	@echo "####### Please run ./configure again - it's changed! #######"
 	@echo "############################################################"
 
-checkhelp: help/help_mp*.h
-	help/help_check.sh $(CC) $^
+helpcheck: $(addsuffix elpcheck,$(wildcard help/help_mp-*.h))
+
+%.helpcheck: %.h
+	help/help_check.sh $(CC) $<
 
 help_mp.h: help/help_mp-en.h $(HELP_FILE)
 	help/help_create.sh $(HELP_FILE) $(CHARSET)
 
+help/po/%.po: help/help_mp-%.h help/help_mp-en.h
+	mkdir -p $(@D)
+	help/help_create_po.pl $< $@
+
+%.mo: %.po
+	msgfmt $< -o $@
+
 # rebuild version.h each time the working copy is updated
 version.h: version.sh $(wildcard .svn/entries .git/logs/HEAD)
 	./$< `$(CC) -dumpversion`
 
 %$(EXESUF): %.c
-	$(CC) $(CC_DEPFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
+	$(CC) $(CC_DEPFLAGS) $(CFLAGS) $(CC_LINK_O) $^ $(LIBS)
 
 %.ho: %.h
-	$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
+	$(CC) $(CFLAGS) -Wno-unused -c $(CC_O) -x c $<
 
 checkheaders: $(ALLHEADERS:.h=.ho)
 
@@ -826,7 +838,7 @@
 
 osdep/mplayer-rc.o: osdep/mplayer.exe.manifest
 
-gui/%: CFLAGS += -Wno-strict-prototypes
+gui/%: CFLAGS += -DLOCALEDIR=\"$(prefix)/share/locale\" -Wno-strict-prototypes
 
 loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
 #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
@@ -856,13 +868,14 @@
 install-%: %$(EXESUF) install-dirs
 	$(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
 
-install-gui: install-mplayer install-gui-icons
+install-gui: install-mplayer install-gui-icons install-gui-msg
 	-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
 	$(INSTALL) -d $(DATADIR)/skins $(prefix)/share/applications
 	$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
 
 install-gui-icons:    $(foreach size,$(GUI_ICONSIZES),install-gui-icon-$(size))
 install-gui-man:      $(foreach lang,$(MAN_LANGS),install-gui-man-$(lang))
+install-gui-msg:      $(foreach lang,$(filter-out $(firstword $(MSG_LANGS)),$(MSG_LANGS)),install-gui-msg-$(lang))
 install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
 install-mplayer-man:  $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
 
@@ -887,6 +900,12 @@
 	cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1
 endef
 
+define GUI_MSG_RULE
+install-gui-msg-$(lang): help/po/$(lang).mo
+	$(INSTALL) -d $(prefix)/share/locale/$(lang)/LC_MESSAGES
+	$(INSTALL) -m 644 help/po/$(lang).mo $(prefix)/share/locale/$(lang)/LC_MESSAGES/mplayer.mo
+endef
+
 define MENCODER_MAN_RULE
 install-mencoder-man-$(lang): install-mplayer-man-$(lang)
 	cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1
@@ -900,17 +919,18 @@
 
 $(foreach size,$(GUI_ICONSIZES),$(eval $(GUI_ICON_RULE)))
 $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(GUI_MAN_RULE)))
+$(foreach lang,$(MSG_LANGS),$(eval $(GUI_MSG_RULE)))
 $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MENCODER_MAN_RULE)))
 $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_MAN_RULE)))
 
 uninstall:
 	rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
 	rm -f $(BINDIR)/mencoder$(EXESUF)
-	rm -f $(MANDIR)/man1/mencoder.1 $(MANDIR)/man1/mplayer.1
 	rm -f $(foreach size,$(GUI_ICONSIZES),$(prefix)/share/icons/hicolor/$(size)/apps/mplayer.png)
 	rm -f $(prefix)/share/applications/mplayer.desktop
-	rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1
-	rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man)))
+	rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 $(MANDIR)/man1/gmplayer.1
+	rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1 gmplayer.1,$(MANDIR)/$(lang)/man1/$(man)))
+	rm -f $(foreach lang,$(MSG_LANGS),$(prefix)/share/locale/$(lang)/LC_MESSAGES/mplayer.mo)
 
 clean: testsclean toolsclean driversclean dhahelperclean
 	-$(MAKE) -C ffmpeg $@
@@ -920,7 +940,7 @@
 	-rm -f $(VIDIX_PCI_FILES)
 	-rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo)
 	-rm -f codecs.conf.h help_mp.h version.h
-	-rm -rf DOCS/tech/doxygen DOCS/HTML
+	-rm -rf DOCS/tech/doxygen DOCS/HTML help/po
 
 distclean: clean
 	-$(MAKE) -C ffmpeg $@
@@ -1022,12 +1042,12 @@
     ffmpeg/libswscale/libswscale.a ffmpeg/libavutil/libavutil.a $(MP_MSG_OBJS)
 
 mplayer-nomain.o: mplayer.c
-	$(CC) $(CFLAGS) -DDISABLE_MAIN -c -o $@ $<
+	$(CC) $(CFLAGS) -DDISABLE_MAIN -c $(CC_O) $<
 
 TOOLS/netstream$(EXESUF): TOOLS/netstream.c
 TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c
 TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
-	$(CC) $(CC_DEPFLAGS) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
+	$(CC) $(CC_DEPFLAGS) $(CFLAGS) $(CC_LINK_O) $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
 
 REAL_SRCS    = $(wildcard TOOLS/realcodecs/*.c)
 REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)
@@ -1108,9 +1128,11 @@
 -include $(DEP_FILES) $(DRIVER_DEP_FILES) $(TESTS_DEP_FILES) $(TOOLS_DEP_FILES) $(DHAHELPER_DEP_FILES)
 
 .PHONY: all doxygen *install* *tools drivers dhahelper*
-.PHONY: checkheaders *clean tests check_checksums fatetest checkhelp
+.PHONY: checkheaders *clean tests check_checksums fatetest helpcheck
 .PHONY: doc html-chunked* html-single* xmllint*
 
+.SECONDARY: $(patsubst %.mo,%.po,$(ALL_MSGS))
+
 # Disable suffix rules.  Most of the builtin rules are suffix rules,
 # so this saves some time on slow systems.
 .SUFFIXES:

MPlayer-1.2.r38170.tar.xz/asxparser.c -> MPlayer-1.2.r38304.tar.xz/asxparser.c Changed

@@ -22,9 +22,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 
+#include "libavutil/avstring.h"
 #include "playtree.h"
 #include "playtreeparser.h"
 #include "stream/stream.h"
@@ -56,7 +56,7 @@
 
   if(attrib == NULL || attribs == NULL) return NULL;
   for(ptr = attribs; ptr[0] != NULL; ptr += 2){
-    if(strcasecmp(ptr[0],attrib) == 0)
+    if(av_strcasecmp(ptr[0],attrib) == 0)
       return strdup(ptr[1]);
   }
   return NULL;
@@ -69,7 +69,7 @@
 
   if(valid_vals == NULL || val == NULL) return -2;
   for(ptr = valid_vals ; ptr[0] != NULL ; ptr++) {
-    if(strcasecmp(val,ptr[0]) == 0) return r;
+    if(av_strcasecmp(val,ptr[0]) == 0) return r;
     r++;
   }
 
@@ -323,11 +323,11 @@
         free(attribs);
         return -1;
       }
-      if(ptr4[1] != '/' && strncasecmp(element,ptr4+1,strlen(element)) == 0) {
+      if(ptr4[1] != '/' && av_strncasecmp(element,ptr4+1,strlen(element)) == 0) {
         in++;
         ptr4+=2;
         continue;
-      } else if(strncasecmp(element,ptr4+2,strlen(element)) == 0) { // Extract body
+      } else if(av_strncasecmp(element,ptr4+2,strlen(element)) == 0) { // Extract body
         if(in > 0) {
           in--;
           ptr4 += 2+strlen(element);
@@ -498,7 +498,7 @@
     } else if (r == 0) { // No more element
       break;
     }
-    if(strcasecmp(element,"REF") == 0) {
+    if(av_strcasecmp(element,"REF") == 0) {
       asx_parse_ref(parser,attribs,ref);
       mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Adding element %s to entry\n",element);
       nref++;
@@ -547,28 +547,28 @@
     } else if (r == 0) { // No more element
       break;
     }
-    if(strcasecmp(element,"ENTRY") == 0) {
+    if(av_strcasecmp(element,"ENTRY") == 0) {
        entry = asx_parse_entry(parser,body,attribs);
        if(entry) {
          if(!list) list =  entry;
          else play_tree_append_entry(list,entry);
          mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Adding element %s to repeat\n",element);
        }
-    } else if(strcasecmp(element,"ENTRYREF") == 0) {
+    } else if(av_strcasecmp(element,"ENTRYREF") == 0) {
        entry = asx_parse_entryref(parser,body,attribs);
        if(entry) {
          if(!list) list =  entry;
          else play_tree_append_entry(list,entry);
          mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Adding element %s to repeat\n",element);
        }
-     } else if(strcasecmp(element,"REPEAT") == 0) {
+     } else if(av_strcasecmp(element,"REPEAT") == 0) {
        entry = asx_parse_repeat(parser,body,attribs);
        if(entry) {
          if(!list) list =  entry;
          else play_tree_append_entry(list,entry);
          mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Adding element %s to repeat\n",element);
        }
-     } else if(strcasecmp(element,"PARAM") == 0) {
+     } else if(av_strcasecmp(element,"PARAM") == 0) {
        asx_parse_param(parser,attribs,repeat);
      } else
        mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Ignoring element %s\n",element);
@@ -610,7 +610,7 @@
     return NULL;
   }
 
-  if(strcasecmp(element,"ASX") != 0) {
+  if(av_strcasecmp(element,"ASX") != 0) {
     mp_msg(MSGT_PLAYTREE,MSGL_ERR,"first element isn't ASX, it's %s\n",element);
     free(element);
     free(asx_body);
@@ -645,21 +645,21 @@
      } else if (r == 0) { // No more element
        break;
      }
-     if(strcasecmp(element,"ENTRY") == 0) {
+     if(av_strcasecmp(element,"ENTRY") == 0) {
        entry = asx_parse_entry(parser,body,attribs);
        if(entry) {
          if(!list) list =  entry;
          else play_tree_append_entry(list,entry);
          mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Adding element %s to asx\n",element);
        }
-     } else if(strcasecmp(element,"ENTRYREF") == 0) {
+     } else if(av_strcasecmp(element,"ENTRYREF") == 0) {
        entry = asx_parse_entryref(parser,body,attribs);
        if(entry) {
          if(!list) list =  entry;
          else play_tree_append_entry(list,entry);
          mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Adding element %s to asx\n",element);
        }
-     } else if(strcasecmp(element,"REPEAT") == 0) {
+     } else if(av_strcasecmp(element,"REPEAT") == 0) {
        entry = asx_parse_repeat(parser,body,attribs);
        if(entry) {
          if(!list) list =  entry;

MPlayer-1.2.r38170.tar.xz/av_helpers.c -> MPlayer-1.2.r38304.tar.xz/av_helpers.c Changed

@@ -98,7 +98,6 @@
     if (!avcodec_initialized) {
         show_av_version(MSGT_DECVIDEO, "libavcodec", LIBAVCODEC_VERSION_INT,
                         avcodec_version(), avcodec_configuration());
-        avcodec_register_all();
         avcodec_initialized = 1;
         av_log_set_callback(mp_msp_av_log_callback);
     }
@@ -109,7 +108,6 @@
     if (!avformat_initialized) {
         show_av_version(MSGT_DEMUX, "libavformat", LIBAVFORMAT_VERSION_INT,
                         avformat_version(), avformat_configuration());
-        av_register_all();
         avformat_initialized = 1;
         av_log_set_callback(mp_msp_av_log_callback);
     }
@@ -132,8 +130,6 @@
                             ctx->channels,
                             src_len / bps, bps);
     }
-    pkt.data = dst;
-    pkt.size = dst_len;
     frame->nb_samples = src_len / ctx->channels / bps;
     if (planar) {
         // TODO: this is horribly inefficient.
@@ -150,11 +146,22 @@
             }
         }
     }
+    frame->format = ctx->sample_fmt;
+    frame->channels = ctx->channels;
     n = avcodec_fill_audio_frame(frame, ctx->channels, ctx->sample_fmt, src, src_len, 1);
     if (n < 0) return 0;
-    n = avcodec_encode_audio2(ctx, &pkt, frame, &got);
+    n = avcodec_send_frame(ctx, frame);
+    av_init_packet(&pkt);
+    got = avcodec_receive_packet(ctx, &pkt);
     av_frame_free(&frame);
     if (planar) av_free(src);
     if (n < 0) return n;
-    return got ? pkt.size : 0;
+    if (got >= 0) {
+        int size = pkt.size;
+        if (size > dst_len) return -1;
+        memcpy(dst, pkt.data, size);
+        av_packet_unref(&pkt);
+        return size;
+    }
+    return 0;
 }

MPlayer-1.2.r38170.tar.xz/av_opts.c -> MPlayer-1.2.r38304.tar.xz/av_opts.c Changed

MPlayer-1.2.r38170.tar.xz/bstr.c -> MPlayer-1.2.r38304.tar.xz/bstr.c Changed

MPlayer-1.2.r38170.tar.xz/cfg-common.h -> MPlayer-1.2.r38304.tar.xz/cfg-common.h Changed

MPlayer-1.2.r38170.tar.xz/codec-cfg.c -> MPlayer-1.2.r38304.tar.xz/codec-cfg.c Changed

@@ -40,7 +40,6 @@
 #include <ctype.h>
 #include <assert.h>
 #include <string.h>
-#include <strings.h>
 
 #include "config.h"
 #include "mp_msg.h"
@@ -50,6 +49,10 @@
 #else
 #define mp_msg(t, l, ...) fprintf(stderr, __VA_ARGS__)
 #endif
+#include <strings.h>
+#define av_strcasecmp(a, b) strcasecmp(a, b)
+#else
+#include <libavutil/avstring.h>
 #endif
 
 #include "help_mp.h"
@@ -816,13 +819,13 @@
         } else if (!strcmp(token[0], "status")) {
             if (get_token(1, 1) < 0)
                 goto err_out_parse_error;
-            if (!strcasecmp(token[0], "working"))
+            if (!av_strcasecmp(token[0], "working"))
                 codec->status = CODECS_STATUS_WORKING;
-            else if (!strcasecmp(token[0], "crashing"))
+            else if (!av_strcasecmp(token[0], "crashing"))
                 codec->status = CODECS_STATUS_NOT_WORKING;
-            else if (!strcasecmp(token[0], "untested"))
+            else if (!av_strcasecmp(token[0], "untested"))
                 codec->status = CODECS_STATUS_UNTESTED;
-            else if (!strcasecmp(token[0], "buggy"))
+            else if (!av_strcasecmp(token[0], "buggy"))
                 codec->status = CODECS_STATUS_PROBLEMS;
             else
                 goto err_out_parse_error;

MPlayer-1.2.r38170.tar.xz/command.c -> MPlayer-1.2.r38304.tar.xz/command.c Changed

@@ -22,7 +22,6 @@
 #include <inttypes.h>
 #include <unistd.h>
 #include <string.h>
-#include <strings.h>
 
 #include "config.h"
 #include "command.h"
@@ -1123,7 +1122,7 @@
                                void *arg, MPContext *mpctx)
 {
     int ret;
-    int capturing = mpctx->stream && mpctx->stream->capture_file;
+    int capturing = mpctx->stream && mpctx->stream->capture_stream;
 
     if (!mpctx->stream)
         return M_PROPERTY_UNAVAILABLE;
@@ -1134,17 +1133,18 @@
     }
 
     ret = m_property_flag(prop, action, arg, &capturing);
-    if (ret == M_PROPERTY_OK && capturing != !!mpctx->stream->capture_file) {
+    if (ret == M_PROPERTY_OK && capturing != !!mpctx->stream->capture_stream) {
         if (capturing) {
-            mpctx->stream->capture_file = fopen(stream_dump_name, "ab");
-            if (!mpctx->stream->capture_file) {
+            int dummy;
+            mpctx->stream->capture_stream = open_stream_full(stream_dump_name, STREAM_APPEND, NULL, &dummy);
+            if (!mpctx->stream->capture_stream) {
                 mp_msg(MSGT_GLOBAL, MSGL_ERR,
                        "Error opening capture file: %s\n", strerror(errno));
                 ret = M_PROPERTY_ERROR;
             }
         } else {
-            fclose(mpctx->stream->capture_file);
-            mpctx->stream->capture_file = NULL;
+            free_stream(mpctx->stream->capture_stream);
+            mpctx->stream->capture_stream = NULL;
         }
     }
 
@@ -1154,7 +1154,7 @@
         break;
     case M_PROPERTY_OK:
         set_osd_msg(OSD_MSG_SPEED, 1, osd_duration, MSGTR_OSDCapturing,
-                    mpctx->stream->capture_file ? MSGTR_Enabled : MSGTR_Disabled);
+                    mpctx->stream->capture_stream ? MSGTR_Enabled : MSGTR_Disabled);
         break;
     default:
         break;
@@ -1315,10 +1315,10 @@
 
 #ifdef CONFIG_TV
     if (mpctx->demuxer->type == DEMUXER_TYPE_TV) {
-        int l = strlen(prop->name);
-        char tv_prop[3 + l + 1];
-        sprintf(tv_prop, "tv_%s", prop->name);
-        return mp_property_do(tv_prop, action, arg, mpctx);
+        char *tv_prop = av_asprintf("tv_%s", prop->name);
+        r = mp_property_do(tv_prop, action, arg, mpctx);
+        av_freep(&tv_prop);
+        return r;
     }
 #endif
 
@@ -3423,7 +3423,7 @@
 
                 for (i = 0; mp_dvdnav_bindings[i].name; i++)
                   if (cmd->args[0].v.s &&
-                      !strcasecmp (cmd->args[0].v.s,
+                      !av_strcasecmp (cmd->args[0].v.s,
                                    mp_dvdnav_bindings[i].name))
                     command = mp_dvdnav_bindings[i].cmd;

MPlayer-1.2.r38304.tar.xz/compatinc Added

MPlayer-1.2.r38304.tar.xz/compatinc/unistd.h Added

MPlayer-1.2.r38170.tar.xz/configure -> MPlayer-1.2.r38304.tar.xz/configure Changed

@@ -50,6 +50,10 @@
   tr '[a-z]' '[A-Z]'
 }
 
+cc_link_o() {
+  eval printf '%s\\n' $CC_LINK_O
+}
+
 # Prefer these macros to full length text !
 # These macros only return an error code - NO display is done
 compile_check() {
@@ -58,9 +62,9 @@
   echo >> "$TMPLOG"
   cat "$source" >> "$TMPLOG"
   echo >> "$TMPLOG"
-  echo "$_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS $source $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@ $libm" >> "$TMPLOG"
+  echo "$_cc $($filter_flags $WARNFLAGS $WARN_CFLAGS $CFLAGS $source $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder $(cc_link_o $TMPEXE) $@) $libm" >> "$TMPLOG"
   rm -f "$TMPEXE"
-  $_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS "$source" $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" $libm >> "$TMPLOG" 2>&1
+  $_cc $($filter_flags $WARNFLAGS $WARN_CFLAGS $CFLAGS "$source" $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder $(cc_link_o $TMPEXE) "$@") $libm >> "$TMPLOG" 2>&1
   TMPRES="$?"
   echo >> "$TMPLOG"
   echo >> "$TMPLOG"
@@ -228,6 +232,7 @@
 sunos()     { issystem "SunOS"; }
 wine()      { issystem "Wine"; }
 win32()     { cygwin || mingw32 || wine; }
+msvc()      { test "$cc_vendor" = "msvc"; }
 
 # arch test boolean functions
 # x86/x86pc is used by QNX
@@ -418,6 +423,7 @@
   --disable-ffmpeg_a        disable static FFmpeg [autodetect]
   --disable-ffmpeg_so       disable shared FFmpeg [autodetect]
   --disable-postproc        disable libpostproc [autodetect]
+  --disable-libxml2         disable XML handling, for DASH streams [autodetect]
   --enable-vf-lavfi         enable libavfilter wrapper [disabled]
   --disable-libavcodec_mpegaudio_hp disable high precision audio decoding
                                     in libavcodec [enabled]
@@ -542,12 +548,15 @@
   --language-man=lang    language to use for the man pages [en]
   --language-msg=lang    language to use for the messages and the GUI [en]
   --language=lang        default language to use [en]
+  --disable-nls          disable Native Language Support (GUI only) [autodetect]
 Specific options override --language. You can pass a list of languages separated
 by whitespace or commas instead of a single language. Nonexisting translations
 will be dropped from each list. All documentation and man page translations
-available in the list will be installed, for the messages the first available
-translation will be used. The value "all" will activate all translations. The
-LINGUAS environment variable is honored. In all cases the fallback is English.
+available in the list will be installed. This also applies to the messages,
+unless --disable-nls is specified or autodetected, in which case the first
+available translation will be used. The value "all" will activate all
+translations. The LINGUAS environment variable is honored. In all cases the
+fallback is English.
 Available values are: all $msg_lang_all
 
 Miscellaneous options:
@@ -558,6 +567,7 @@
   --as=ASSEMBLER         assembler to build MPlayer [as]
   --nm=NM                nm tool to build MPlayer [nm]
   --yasm=YASM            Yasm assembler to build MPlayer [yasm]
+  --strip=STRIP          use strip tool STRIP [strip]
   --ar=AR                librarian to build MPlayer [ar]
   --ranlib=RANLIB        ranlib to build MPlayer [ranlib]
   --windres=WINDRES      windres to build MPlayer [windres]
@@ -659,6 +669,7 @@
 _ranlib=ranlib
 _windres=windres
 _cc=cc
+_strip=
 _ar=ar
 _arflags=rc
 # create thin archive to save disk space and I/O
@@ -673,6 +684,7 @@
 ffmpeg_a=auto
 ffmpeg_so=auto
 postproc=auto
+_libxml2=auto
 _vf_lavfi=no
 _libavcodec_mpegaudio_hp=yes
 _libopencore_amrnb=auto
@@ -816,6 +828,7 @@
 _apple_remote=auto
 _apple_ir=auto
 _gui=no
+_nls=auto
 _termcap=auto
 _termios=auto
 _3dfx=no
@@ -958,6 +971,9 @@
   --cc=*)
     _cc=$(option_value $ac_option)
     ;;
+  --strip=*)
+    _strip=$(option_value $ac_option)
+    ;;
   --host-cc=*)
     _host_cc=$(option_value $ac_option)
     ;;
@@ -1278,6 +1294,8 @@
   --disable-ffmpeg_so)  ffmpeg_so=no    ;;
   --enable-postproc)    postproc=yes    ;;
   --disable-postproc)   postproc=no     ;;
+  --enable-libxml2)     _libxml2=yes    ;;
+  --disable-libxml2)    _libxml2=no     ;;
   --enable-vf-lavfi)    _vf_lavfi=yes   ;;
   --disable-vf-lavfi)   _vf_lavfi=no    ;;
   --enable-libavcodec_mpegaudio_hp)     _libavcodec_mpegaudio_hp=yes    ;;
@@ -1293,6 +1311,8 @@
   --disable-apple-ir)   _apple_ir=no    ;;
   --enable-gui)         _gui=yes        ;;
   --disable-gui)        _gui=no         ;;
+  --enable-nls)         _nls=yes        ;;
+  --disable-nls)        _nls=no         ;;
   --enable-termcap)     _termcap=yes    ;;
   --disable-termcap)    _termcap=no     ;;
   --enable-termios)     _termios=yes    ;;
@@ -1556,6 +1576,13 @@
   return 0
 }
 
+list_cbs_extern() {
+  test ! -e ffmpeg/libav${3} && return 1
+  pattern="s/^[^#]*extern.*${1} *ff_cbs_type_$[^ ]*$;/${2}_\1/p"
+  sed -n "$pattern" ffmpeg/libav${3} | toupper
+  return 0
+}
+
 list_subparts_filters() {
   test ! -e ffmpeg/libav${1} && return 1
   pattern="s/^extern AVFilter ff_([avfsinkrc]{2,5})_([a-zA-Z0-9_]+);/\1_\2_filter/p"
@@ -1587,6 +1614,11 @@
 test $? -eq 0 && _list_subparts_extern=found || _list_subparts_extern="not found"
 echores "$_list_subparts_extern"
 
+echocheck "ffmpeg/libavcodec/cbs_internal.h"
+libavcbs_all=$(list_cbs_extern CodedBitstreamType cbs codec/cbs_internal.h)
+test $? -eq 0 && _list_subparts_extern=found || _list_subparts_extern="not found"
+echores "$_list_subparts_extern"
+
 echocheck "ffmpeg/libavformat/protocols.c"
 libavprotocols_all=$(list_subparts_extern URLProtocol protocol format/protocols.c)
 test $? -eq 0 && _list_subparts_extern=found || _list_subparts_extern="not found"
@@ -1619,6 +1651,7 @@
 libavencoders=$(echo $libavencoders_all)
 libavparsers=$(echo $libavparsers_all)
 libavbsfs=$(echo $libavbsfs_all)
+libavcbs=$(echo $libavcbs_all)
 # Disable all hardware accelerators for now.
 libavhwaccels=
 libavdemuxers=$(echo $libavdemuxers_all)
@@ -1627,9 +1660,9 @@
 libavfilters=$(echo $libavfilters_all)
 
 libavdecoders=$(filter_out_component decoder 'LIB[A-Z0-9_]* [A-Z0-9]*_QSV [A-Z0-9]*_MMAL [A-Z0-9]*_MEDIACODEC [A-Z0-9]*_CUVID [A-Z0-9_]*_AT [A-Z0-9]*_RKMPP [A-Z0-9]*_V4L2M2M')
-libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* [A-Z0-9]*_QSV [A-Z0-9]*_MMAL NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]* HAP [A-Z0-9]*_VIDEOTOOLBOX [A-Z0-9]*_VAAPI [A-Z0-9]*_OMX [A-Z0-9_]*_AT [A-Z0-9]*_V4L2M2M [A-Z0-9]*_AMF')
+libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* [A-Z0-9]*_QSV [A-Z0-9]*_MMAL NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]* HAP [A-Z0-9]*_VIDEOTOOLBOX [A-Z0-9]*_VAAPI [A-Z0-9]*_OMX [A-Z0-9_]*_AT [A-Z0-9]*_V4L2M2M [A-Z0-9]*_AMF [A-Z0-9]*_MF')
 libavbsfs=$(filter_out_component bsf 'TRACE_HEADERS [A-Z0-9_]*_METADATA H264_REDUNDANT_PPS FILTER_UNITS')
-libavdemuxers=$(filter_out_component demuxer 'AVISYNTH DASH LIB[A-Z0-9_]* REDIR VAPOURSYNTH')
+libavdemuxers=$(filter_out_component demuxer 'AVISYNTH LIB[A-Z0-9_]* REDIR VAPOURSYNTH')
 libavmuxers=$(filter_out_component muxer 'CHROMAPRINT LIB[A-Z0-9_]* RTP RTSP SAP')
 libavprotocols=$(filter_out_component protocol 'BLURAY FFRTMPCRYPT HTTPS LIB[A-Z0-9_]* TLS TLS_GNUTLS TLS_OPENSSL TLS_SECURETRANSPORT TLS_SCHANNEL')
 libavfilters=$(filter_out_component filter 'VF_FREI0R[A-Z0-9_]* LIB[A-Z0-9_]* MP VF_OCV')
@@ -1655,7 +1688,29 @@
   esac
 done
 
+msvc_filter_flags() {
+  for f; do
+    case $f in
+      -fno-common) ;;
+      -march=*) ;;
+      -mcpu=*) ;;
+      -mfpu=*) ;;
+      -mtune=*) ;;
+      -pipe) ;;
+      -M*) ;;
+      -l*) echo -n ${f#-l}.lib" " ;;
+      *) echo -n $f" " ;;
+    esac
+  done
+}
 
+AR_O='$@'
+CC_O='-o $@'
+CC_LINK_O='-o $@'
+WINDRES_O='-o $@'
+def_inline_asm='#define HAVE_INLINE_ASM 1'
+inline_asm=yes
+filter_flags=echo
 # Checking CC version...
 # Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure)
 if test "$(basename $_cc)" = "icc" || test "$(basename $_cc)" = "ecc"; then
@@ -1680,6 +1735,32 @@
       ;;
   esac
   echores "$cc_version"
+elif test "$(basename $_cc .exe)" = "cl"; then
+  echocheck "$_cc version"

MPlayer-1.2.r38170.tar.xz/cpudetect.c -> MPlayer-1.2.r38304.tar.xz/cpudetect.c Changed

MPlayer-1.2.r38170.tar.xz/etc/codecs.conf -> MPlayer-1.2.r38304.tar.xz/etc/codecs.conf Changed

MPlayer-1.2.r38170.tar.xz/etc/mplayer.desktop -> MPlayer-1.2.r38304.tar.xz/etc/mplayer.desktop Changed

MPlayer-1.2.r38170.tar.xz/gui/app/cfg.c -> MPlayer-1.2.r38304.tar.xz/gui/app/cfg.c Changed

@@ -93,8 +93,7 @@
 int gtkReplayGainOn;
 int gtkReplayGainAdjustment;
 
-int gtkEnablePlayBar = True;
-int gtkLoadFullscreen;
+int gtkEnablePlayBar   = True;
 int gtkShowVideoWindow = True;
 
 int gui_save_pos    = True;
@@ -179,7 +178,7 @@
     { "replay_gain_adjustment",      &gtkReplayGainAdjustment, CONF_TYPE_INT,         CONF_RANGE,  -30,   10,         NULL },
 
     { "playbar",                     &gtkEnablePlayBar,        CONF_TYPE_FLAG,        0,           0,     1,          NULL },
-    { "load_fullscreen",             &gtkLoadFullscreen,       CONF_TYPE_FLAG,        0,           0,     1,          NULL },
+    { "load_fullscreen",             &fullscreen,              CONF_TYPE_FLAG,        0,           0,     1,          NULL },
     { "show_videowin",               &gtkShowVideoWindow,      CONF_TYPE_FLAG,        0,           0,     1,          NULL },
 
     { "gui_save_pos",                &gui_save_pos,            CONF_TYPE_FLAG,        0,           0,     1,          NULL },
@@ -279,14 +278,14 @@
     gui_conf = m_config_new();
 
     if (!gui_conf) {
-        gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed);
+        gmp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MemAllocFailed));
         mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
     }
 
     m_config_register_options(gui_conf, gui_opts);
 
     if (!disable_gui_conf && (m_config_parse_config_file(gui_conf, fname, 1) < 0)) {
-        gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_ConfigFileError "\n");
+        gmp_msg(MSGT_GPLAYER, MSGL_ERR, _(MSGTR_GUI_ConfigFileError));
         mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
     }
 
@@ -307,7 +306,7 @@
             item = calloc(1, sizeof(*item));
 
             if (!item) {
-                gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed);
+                gmp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MemAllocFailed));
                 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
             }
 
@@ -342,7 +341,7 @@
             item = calloc(1, sizeof(*item));
 
             if (!item) {
-                gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed);
+                gmp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MemAllocFailed));
                 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
             }
 
@@ -423,7 +422,7 @@
             char *val = m_option_print(opts, opts->p);
 
             if (val == (char *)-1) {
-                gmp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_UnableToSaveOption, opts->name);
+                gmp_msg(MSGT_GPLAYER, MSGL_WARN, _(MSGTR_GUI_MSG_UnableToSaveOption), opts->name);
                 val = NULL;
             }

MPlayer-1.2.r38170.tar.xz/gui/app/cfg.h -> MPlayer-1.2.r38304.tar.xz/gui/app/cfg.h Changed

MPlayer-1.2.r38170.tar.xz/gui/app/gui.h -> MPlayer-1.2.r38304.tar.xz/gui/app/gui.h Changed

MPlayer-1.2.r38170.tar.xz/gui/dialog/about.c -> MPlayer-1.2.r38304.tar.xz/gui/dialog/about.c Changed

@@ -57,12 +57,13 @@
   GtkAccelGroup * accel_group;
 
   char title[128];
+  gchar *about;
 
   accel_group=gtk_accel_group_new();
 
   About=gtk_window_new( GTK_WINDOW_TOPLEVEL );
-  gtk_widget_set_usize( About,340,415 );
-  gtk_window_set_title( GTK_WINDOW( About ),MSGTR_GUI_AboutMPlayer );
+  gtk_widget_set_usize( About,370,425 );
+  gtk_window_set_title( GTK_WINDOW( About ),_(MSGTR_GUI_AboutMPlayer) );
   gtk_window_set_position( GTK_WINDOW( About ),GTK_WIN_POS_CENTER );
   gtk_window_set_policy( GTK_WINDOW( About ),FALSE,FALSE,TRUE );
   gtk_window_set_wmclass( GTK_WINDOW( About ),"About",MPlayer );
@@ -78,7 +79,6 @@
 
   gtk_widget_show( pixmap1 );
   gtk_box_pack_start( GTK_BOX( vbox ),pixmap1,FALSE,FALSE,0 );
-  gtk_widget_set_usize( pixmap1,-2,174 );
 
   gtkAddHSeparator( vbox );
 
@@ -96,236 +96,243 @@
   gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText );
   snprintf(title, sizeof(title), MP_TITLE, MPlayer);
   gtk_text_buffer_insert (AboutTextBuffer, &iter, title, -1);
-  gtk_text_buffer_insert (AboutTextBuffer, &iter,
+  about = g_strdup_printf(
+    "\n"
+    "%s:\n"
     "\n"
-    MSGTR_GUI_Sponsored":\n"
     "       http://www.uhulinux.hu/\n"
     "\n"
-    MSGTR_GUI_Contributors":\n"
+    "%s:\n"
     "\n"
-    "     * Andreas Ackermann\n"
-    "     * adland\n"
-    "     * Eric Anholt\n"
-    "     * Folke Ashberg\n"
-    "     * Dénes Balatoni\n"
-    "     * Zsolt Barat\n"
-    "     * Luca Barbato\n"
-    "     * Dmitry Baryshkov\n"
-    "     * Bertrand Baudet\n"
-    "     * Alban Bedel\n"
-    "     * Michael Behrisch\n"
-    "     * Luchezar Belev\n"
-    "     * Gábor Bérczi\n"
-    "     * Szabolcs Berecz\n"
-    "     * Alex Beregszászi\n"
-    "     * Tilmann Bitterberg\n"
-    "     * Diego Biurrun\n"
-    "     * Marcsu Blomenkamp\n"
-    "     * Ingo Brückl\n"
-    "     * Andrew Buehler\n"
-    "     * Eviv Bulgroz\n"
-    "     * Felix Bünemann\n"
-    "     * Moritz Bunkus\n"
-    "     * Dan Villiom Podlaski Christiansen\n"
-    "     * Jeff Clagg\n"
-    "     * compn\n"
-    "     * Marcus Comstedt\n"
-    "     * Kees Cook\n"
-    "     * Stephen Davies\n"
-    "     * Piero Di Vita\n"
-    "     * Tobias Diedrich\n"
-    "     * Florian Dietrich\n"
-    "     * Jeroen Dobbelaere\n"
-    "     * Reimar Döffinger\n"
-    "     * Romain Dolbeau\n"
-    "     * Ismail Dönmez\n"
-    "     * Robert Edele\n"
-    "     * Christoph Egger\n"
-    "     * Paul Wilhelm Elsinghorst\n"
-    "     * Bernd Ernesti\n"
-    "     * Salvatore Falco\n"
-    "     * Johannes Feigl\n"
-    "     * D Richard III Felker\n"
-    "     * Tim Ferguson\n"
-    "     * Ross Finlayson\n"
-    "     * Daniele Forghieri\n"
-    "     * Kilian A. Foth\n"
-    "     * Fabian Franz\n"
-    "     * Martin Gansser\n"
-    "     * Árpád Gereöffy\n"
-    "     * Matteo Giani\n"
-    "     * Sven Goethel\n"
-    "     * German Gomez Garcia\n"
-    "     * Alexander Gottwald\n"
-    "     * Michael Graffam\n"
-    "     * Andriy N. Gritsenko\n"
-    "     * Rémi Guyomarch\n"
-    "     * Jürgen Hammelmann\n"
-    "     * Christopher R. Hertel\n"
-    "     * Andreas Hess\n"
-    "     * Corey Hickey\n"
-    "     * Zoltán Hidvégi\n"
-    "     * Jens Hoffmann\n"
-    "     * David Holm\n"
-    "     * Bohdan Horst\n"
-    "     * Hampa Hug\n"
-    "     * Tomas Hurka\n"
-    "     * Sidik Isani\n"
-    "     * Panagiotis Issaris\n"
-    "     * Aurelien Jacobs\n"
-    "     * Reza Jelveh\n"
-    "     * Jonas Jermann\n"
-    "     * Anders Johansson\n"
-    "     * Nicholas Kain\n"
-    "     * Filip Kalinski\n"
-    "     * Ivan Kalvachev\n"
-    "     * Wojtek Kaniewski\n"
-    "     * Kim Minh Kaplan\n"
-    "     * Samuli Kärkkäinen\n"
-    "     * Jürgen Keil\n"
-    "     * Robert Kesterson\n"
-    "     * Attila Kinali\n"
-    "     * Gregory Kovriga\n"
-    "     * David Kühling\n"
-    "     * Fredrik Kuivinen\n"
-    "     * Nick Kurshev\n"
-    "     * Brian Kuschak\n"
-    "     * Vladimir Kushnir\n"
-    "     * Dave Lambley\n"
-    "     * Gyula László\n"
-    "     * Nicolas Le Gaillart\n"
-    "     * Gábor Lénárt\n"
-    "     * Colin Leroy\n"
-    "     * Oskar Liljeblad\n"
-    "     * Sam Lin\n"
-    "     * Pierre Lombard\n"
-    "     * Puk Madick\n"
-    "     * Jindrich Makovicka\n"
-    "     * Rudolf Marek\n"
-    "     * László Megyer\n"
-    "     * Mike Melanson\n"
-    "     * Arwed von Merkatz\n"
-    "     * Loren Merritt\n"
-    "     * Dominik Mierzejewski\n"
-    "     * Mihail Milushev\n"
-    "     * Nehal Mistry\n"
-    "     * András Mohari\n"
-    "     * Steven Mueller\n"
-    "     * Alexander Neundorf\n"
-    "     * Michael Niedermayer\n"
-    "     * Fredrik Noring\n"
-    "     * Christian Ohm\n"
-    "     * Joey Parrish\n"
-    "     * Dariusz Pietrzak\n"
-    "     * Nicolas Plourde\n"
-    "     * Lennart Poettering\n"
-    "     * Guillaume Poirier\n"
-    "     * Zoltán Ponekker\n"
-    "     * Ivo van Poorten\n"
-    "     * Lu Ran\n"
-    "     * Uwe Reder\n"
-    "     * rgselk\n"
-    "     * Rune Petersen\n"
-    "     * Ville Saari\n"
-    "     * Nico Sabbi\n"
-    "     * Björn Sandell\n"
-    "     * Tilman Sauerbeck\n"
-    "     * Frank Scherthan\n"
-    "     * Florian Schneider\n"
-    "     * Oliver Schoenbrunner\n"
-    "     * Oded Shimon\n"
-    "     * Peter Simon\n"
-    "     * Rik Snel\n"
-    "     * Sascha Sommer\n"
-    "     * Alexander Strasser\n"
-    "     * Kamil Strzelecki\n"
-    "     * Jiri Svoboda\n"
-    "     * Robert Swain\n"
-    "     * Ville Syrjälä\n"
-    "     * Gabor Szecsi\n"
-    "     * Jason Tackaberry\n"
-    "     * Howell Tam\n"
-    "     * Adam Tlalka\n"
-    "     * Gianluigi Tiesi\n"
-    "     * Roberto Togni\n"
-    "     * Salvador Eduardo Tropea\n"
-    "     * Miklós Vajna\n"
-    "     * Reynaldo H. Verdejo Pinochet\n"
-    "     * Per Wigren\n"
-    "     * Derek J Witt\n"
-    "     * Alan Young\n"
-    "     * Artur Zaprzala\n"
-    "     * Mark Zealey\n"
-    "     * Matan Ziv-Av\n"
-    "     * Márk Vicián Zoltán\n"
+    "     • Andreas Ackermann\n"
+    "     • adland\n"
+    "     • Eric Anholt\n"
+    "     • Folke Ashberg\n"
+    "     • Dénes Balatoni\n"
+    "     • Zsolt Barat\n"

MPlayer-1.2.r38170.tar.xz/gui/dialog/dialog.c -> MPlayer-1.2.r38304.tar.xz/gui/dialog/dialog.c Changed

@@ -42,6 +42,7 @@
 #include "help_mp.h"
 #include "mp_msg.h"
 #include "libavutil/intreadwrite.h"
+#include "osdep/timer.h"
 
 #define THRESHOLD 128   // transparency values equal to or above this will become
                         // opaque, all values below this will become transparent
@@ -96,7 +97,7 @@
 
         g_object_unref(pixbuf);
     } else
-        mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_IconError, guiIconName, size);
+        mp_msg(MSGT_GPLAYER, MSGL_WARN, _(MSGTR_GUI_MSG_IconError), guiIconName, size);
 
     /* start up GTK which realizes the pixmaps */
     gtk_main_iteration_do(FALSE);
@@ -132,7 +133,7 @@
     env = getenv("G_FILENAME_ENCODING");
 
     if ((!env && getenv("G_BROKEN_FILENAMES")) || (gstrncmp(env, "@locale", 7) == 0))
-        mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_LocaleEncoding);
+        mp_msg(MSGT_GPLAYER, MSGL_WARN, _(MSGTR_GUI_MSG_LocaleEncoding));
 
     gtk_init(&argc, &argv);
     wsSetErrorHandler();      // GDK has just set its own handler
@@ -183,37 +184,38 @@
     ShowMessageBox(str);
     gtk_label_set_text(GTK_LABEL(gtkMessageBoxText), str);
 
-    /* enable linewrapping by alex */
-// GTK_LABEL(gtkMessageBoxText)->max_width = 80;
-    if (strlen(str) > 80)
+    if (strlen(str) > 80) {
         gtk_label_set_line_wrap(GTK_LABEL(gtkMessageBoxText), TRUE);
-    else
+        gtk_label_set_justify(GTK_LABEL(gtkMessageBoxText), GTK_JUSTIFY_LEFT);
+        gtk_widget_set_size_request(gtkMessageBoxText, 415, -1);
+    } else
         gtk_label_set_line_wrap(GTK_LABEL(gtkMessageBoxText), FALSE);
 
-    switch (type) {
+    switch (type & ~MSGBOX_WAIT) {
     case MSGBOX_FATAL:
-        gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_GUI_ErrorFatal);
+        gtk_window_set_title(GTK_WINDOW(MessageBox), _(MSGTR_GUI_ErrorFatal));
         gtk_widget_hide(InformationImage);
         gtk_widget_hide(WarningImage);
         gtk_widget_show(ErrorImage);
+        type |= MSGBOX_WAIT;
         break;
 
     case MSGBOX_ERROR:
-        gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_GUI_Error);
+        gtk_window_set_title(GTK_WINDOW(MessageBox), _(MSGTR_GUI_Error));
         gtk_widget_hide(InformationImage);
         gtk_widget_hide(WarningImage);
         gtk_widget_show(ErrorImage);
         break;
 
     case MSGBOX_WARNING:
-        gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_GUI_Warning);
+        gtk_window_set_title(GTK_WINDOW(MessageBox), _(MSGTR_GUI_Warning));
         gtk_widget_hide(InformationImage);
         gtk_widget_show(WarningImage);
         gtk_widget_hide(ErrorImage);
         break;
 
     case MSGBOX_INFORMATION:
-        gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_GUI_Information);
+        gtk_window_set_title(GTK_WINDOW(MessageBox), _(MSGTR_GUI_Information));
         gtk_widget_show(InformationImage);
         gtk_widget_hide(WarningImage);
         gtk_widget_hide(ErrorImage);
@@ -223,9 +225,12 @@
     gtk_widget_show(MessageBox);
     gtkSetLayer(MessageBox);
 
-    if (type == MSGBOX_FATAL)
-        while (MessageBox)
-            gtk_main_iteration_do(0);
+    if (type & MSGBOX_WAIT) {
+        while (MessageBox) {
+            gtk_main_iteration_do(FALSE);
+            usec_sleep(5000);
+        }
+    }
 }
 
 /**
@@ -273,11 +278,10 @@
             FillSkinList(sbSkinDirInData)) {
             gtkSelectInCList(SkinList, param);
             gtk_clist_sort(GTK_CLIST(SkinList));
-            gtk_widget_show(SkinBrowser);
             gtkSetLayer(SkinBrowser);
         } else {
             gtk_widget_destroy(SkinBrowser);
-            gtkMessageBox(MSGBOX_ERROR, MSGTR_GUI_MSG_SkinDirNotFound);
+            gtkMessageBox(MSGBOX_ERROR, _(MSGTR_GUI_MSG_SkinDirNotFound));
         }
 
         break;

MPlayer-1.2.r38170.tar.xz/gui/dialog/dialog.h -> MPlayer-1.2.r38304.tar.xz/gui/dialog/dialog.h Changed

MPlayer-1.2.r38170.tar.xz/gui/dialog/equalizer.c -> MPlayer-1.2.r38304.tar.xz/gui/dialog/equalizer.c Changed

@@ -106,7 +106,7 @@
  gchar * str[2];
  gtk_clist_clear( GTK_CLIST( ChannelsList ) );
  str[1]="";
- str[0]=MSGTR_GUI_ChannelAll;
+ str[0]=_(MSGTR_GUI_ChannelAll);
  gtk_clist_append( GTK_CLIST( ChannelsList ) ,str);
  if ( guiInfo.AudioChannels > 1 )
   {
@@ -260,7 +260,7 @@
 
   Equalizer=gtk_window_new( GTK_WINDOW_TOPLEVEL );
   gtk_widget_set_usize( Equalizer,-1,256 );
-  gtk_window_set_title( GTK_WINDOW( Equalizer ),MSGTR_GUI_Equalizer );
+  gtk_window_set_title( GTK_WINDOW( Equalizer ),_(MSGTR_GUI_Equalizer) );
   gtk_window_set_position( GTK_WINDOW( Equalizer ),GTK_WIN_POS_CENTER );
   gtk_window_set_policy( GTK_WINDOW( Equalizer ),FALSE,FALSE,TRUE );
   gtk_window_set_wmclass( GTK_WINDOW( Equalizer ),"Equalizer",MPlayer );
@@ -336,66 +336,66 @@
     gtk_table_attach( GTK_TABLE( table1 ),A16000,9,10,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Frequency0,NULL ),
+    gtkAddLabel( _(MSGTR_GUI_Frequency0),NULL ),
     0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Frequency1,NULL ),
+    gtkAddLabel( _(MSGTR_GUI_Frequency1),NULL ),
     1,2,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Frequency2,NULL ),
+    gtkAddLabel( _(MSGTR_GUI_Frequency2),NULL ),
     2,3,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Frequency3,NULL ),
+    gtkAddLabel( _(MSGTR_GUI_Frequency3),NULL ),
     3,4,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Frequency4,NULL ),
+    gtkAddLabel( _(MSGTR_GUI_Frequency4),NULL ),
     4,5,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Frequency5,NULL ),
+    gtkAddLabel( _(MSGTR_GUI_Frequency5),NULL ),
     5,6,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Frequency6,NULL ),
+    gtkAddLabel( _(MSGTR_GUI_Frequency6),NULL ),
     6,7,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Frequency7,NULL ),
+    gtkAddLabel( _(MSGTR_GUI_Frequency7),NULL ),
     7,8,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Frequency8,NULL ),
+    gtkAddLabel( _(MSGTR_GUI_Frequency8),NULL ),
     8,9,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Frequency9,NULL ),
+    gtkAddLabel( _(MSGTR_GUI_Frequency9),NULL ),
     9,10,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),0 ),
-    gtkAddLabel( MSGTR_GUI_Audio,NULL ) );
+    gtkAddLabel( _(MSGTR_GUI_Audio),NULL ) );
 
   table1=gtk_table_new( 4,2,FALSE );
   gtk_widget_show( table1 );
   gtk_container_add( GTK_CONTAINER( Notebook ),table1 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Contrast":",NULL ),
+    gtkAddLabelColon( _(MSGTR_GUI_Contrast),NULL ),
     0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Brightness":",NULL ),
+    gtkAddLabelColon( _(MSGTR_GUI_Brightness),NULL ),
     0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Hue":",NULL ),
+    gtkAddLabelColon( _(MSGTR_GUI_Hue),NULL ),
     0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Saturation":",NULL ),
+    gtkAddLabelColon( _(MSGTR_GUI_Saturation),NULL ),
     0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   VContrastadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) );
@@ -419,7 +419,7 @@
     gtk_widget_set_usize( VSaturation,-1,45 );
 
   gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),1 ),
-    gtkAddLabel( MSGTR_GUI_Video,NULL ) );
+    gtkAddLabel( _(MSGTR_GUI_Video),NULL ) );
 
   gtkAddHSeparator( vbox1 );
 
@@ -427,9 +427,9 @@
     gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END );
     gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 );
 
-  Config=gtkAddButton( MSGTR_GUI_Configure,hbuttonbox1 );
-  Clear=gtkAddButton( MSGTR_GUI_Clear,hbuttonbox1 );
-  Ok=gtkAddButton( MSGTR_GUI_Ok,hbuttonbox1 );
+  Config=gtkAddButton( _(MSGTR_GUI_Configure),hbuttonbox1 );
+  Clear=gtkAddButton( _(MSGTR_GUI_Clear),hbuttonbox1 );
+  Ok=gtkAddButton( _(MSGTR_GUI_Ok),hbuttonbox1 );
 
   gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
   gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
@@ -471,12 +471,12 @@
  if ( Equalizer ) gtkRaise( Equalizer );
     else Equalizer=CreateEqualizer();
 
- if ( !gtkEquChannel1 ) gtkEquChannel1=strdup( MSGTR_GUI_FrontRight );
- if ( !gtkEquChannel2 ) gtkEquChannel2=strdup( MSGTR_GUI_FrontLeft );
- if ( !gtkEquChannel3 ) gtkEquChannel3=strdup( MSGTR_GUI_RearRight );
- if ( !gtkEquChannel4 ) gtkEquChannel4=strdup( MSGTR_GUI_RearLeft );
- if ( !gtkEquChannel5 ) gtkEquChannel5=strdup( MSGTR_GUI_Center );
- if ( !gtkEquChannel6 ) gtkEquChannel6=strdup( MSGTR_GUI_Bass );
+ if ( !gtkEquChannel1 ) gtkEquChannel1=strdup( _(MSGTR_GUI_FrontRight) );
+ if ( !gtkEquChannel2 ) gtkEquChannel2=strdup( _(MSGTR_GUI_FrontLeft) );
+ if ( !gtkEquChannel3 ) gtkEquChannel3=strdup( _(MSGTR_GUI_RearRight) );
+ if ( !gtkEquChannel4 ) gtkEquChannel4=strdup( _(MSGTR_GUI_RearLeft) );
+ if ( !gtkEquChannel5 ) gtkEquChannel5=strdup( _(MSGTR_GUI_Center) );
+ if ( !gtkEquChannel6 ) gtkEquChannel6=strdup( _(MSGTR_GUI_Bass) );
 
  eqSetChannelNames();
 
@@ -534,12 +534,12 @@
  if ( EquConfig ) gtkRaise( EquConfig );
     else EquConfig=CreateEquConfig();
 
- Items=g_list_append( Items,(gpointer)MSGTR_GUI_FrontRight  );
- Items=g_list_append( Items,(gpointer)MSGTR_GUI_FrontLeft );
- Items=g_list_append( Items,(gpointer)MSGTR_GUI_RearRight );
- Items=g_list_append( Items,(gpointer)MSGTR_GUI_RearLeft );
- Items=g_list_append( Items,(gpointer)MSGTR_GUI_Center );
- Items=g_list_append( Items,(gpointer)MSGTR_GUI_Bass );
+ Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_FrontRight)  );
+ Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_FrontLeft) );
+ Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_RearRight) );
+ Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_RearLeft) );
+ Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_Center) );
+ Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_Bass) );
 
  gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel1 ),Items );
  gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel2 ),Items );
@@ -589,7 +589,7 @@
 
   EquConfig=gtk_window_new( GTK_WINDOW_TOPLEVEL );
   gtk_widget_set_usize( EquConfig,350,260 );
-  gtk_window_set_title( GTK_WINDOW( EquConfig ),MSGTR_GUI_EqualizerConfiguration );
+  gtk_window_set_title( GTK_WINDOW( EquConfig ),_(MSGTR_GUI_EqualizerConfiguration) );
   gtk_window_set_position( GTK_WINDOW( EquConfig ),GTK_WIN_POS_CENTER );
 //  gtk_window_set_modal( GTK_WINDOW( EquConfig ),TRUE );
   gtk_window_set_policy( GTK_WINDOW( EquConfig ),FALSE,FALSE,TRUE );
@@ -607,27 +607,27 @@
   gtk_table_set_col_spacings( GTK_TABLE( table1 ),4 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Channel1":",NULL ),
+    gtkAddLabelColon( _(MSGTR_GUI_Channel1),NULL ),
     0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Channel2":",NULL ),
+    gtkAddLabelColon( _(MSGTR_GUI_Channel2),NULL ),
     0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Channel3":",NULL ),
+    gtkAddLabelColon( _(MSGTR_GUI_Channel3),NULL ),
     0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Channel4":",NULL ),
+    gtkAddLabelColon( _(MSGTR_GUI_Channel4),NULL ),
     0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Channel5":",NULL ),
+    gtkAddLabelColon( _(MSGTR_GUI_Channel5),NULL ),
     0,1,4,5,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   gtk_table_attach( GTK_TABLE( table1 ),
-    gtkAddLabel( MSGTR_GUI_Channel6":",NULL ),
+    gtkAddLabelColon( _(MSGTR_GUI_Channel6),NULL ),

MPlayer-1.2.r38170.tar.xz/gui/dialog/fileselect.c -> MPlayer-1.2.r38304.tar.xz/gui/dialog/fileselect.c Changed

@@ -19,7 +19,6 @@
 #include <glob.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
@@ -53,6 +52,7 @@
 #include "help_mp.h"
 #include "mpcommon.h"
 #include "mplayer.h"
+#include "libavutil/avstring.h"
 #include "libavutil/common.h"
 #include "stream/stream.h"
 
@@ -169,22 +169,22 @@
 GdkPixmap *dpixmap;
 GdkBitmap *dmask;
 
-static void fs_PersistantHistory(char *subject)
+static void fs_PersistantHistory(char *directory)
 {
     unsigned int i;
     char *entry;
 
-    if (!subject)
+    if (!directory)
         return;
 
     for (i = 0; i < FF_ARRAY_ELEMS(fsHistory); i++)
-        if (gstrcmp(fsHistory[i], subject) == 0) {
+        if (gstrcmp(fsHistory[i], directory) == 0) {
             entry = fsHistory[i];
             break;
         }
 
     if (i == FF_ARRAY_ELEMS(fsHistory)) {
-        entry = strdup(subject);
+        entry = strdup(directory);
         free(fsHistory[--i]);
     }
 
@@ -413,7 +413,7 @@
 
             if (ext || !fext[0]) {
                 for (j = 0; j < fn; j++) {
-                    if (fext[j] == NULL || strcasecmp(fext[j], ext) == 0) {
+                    if (fext[j] == NULL || av_strcasecmp(fext[j], ext) == 0) {
                         fs_get_pixmap(ext, &fpixmap, &fmask);
                         clist_append_fname(list, gg.gl_pathv[i], fpixmap, fmask);
                         break;
@@ -448,7 +448,7 @@
     case FILESELECT_VIDEO_AUDIO:
 
         for (i = 0; fsVideoAudioFilterNames[i][0]; i++)
-            if (strcmp(str, fsVideoAudioFilterNames[i][0]) == 0) {
+            if (strcmp(str, _(fsVideoAudioFilterNames[i][0])) == 0) {
                 fsFilter = fsVideoAudioFilterNames[i][1];
                 fsLastVideoAudioFilterSelected = i;
                 break;
@@ -459,7 +459,7 @@
     case FILESELECT_SUBTITLE:
 
         for (i = 0; fsSubtitleFilterNames[i][0]; i++)
-            if (strcmp(str, fsSubtitleFilterNames[i][0]) == 0) {
+            if (strcmp(str, _(fsSubtitleFilterNames[i][0])) == 0) {
                 fsFilter = fsSubtitleFilterNames[i][1];
                 fsLastSubtitleFilterSelected = i;
                 break;
@@ -470,7 +470,7 @@
     case FILESELECT_AUDIO_TRACK:
 
         for (i = 0; fsAudioFileNames[i][0]; i++)
-            if (strcmp(str, fsAudioFileNames[i][0]) == 0) {
+            if (strcmp(str, _(fsAudioFileNames[i][0])) == 0) {
                 fsFilter = fsAudioFileNames[i][1];
                 fsLastAudioFilterSelected = i;
                 break;
@@ -481,7 +481,7 @@
     case FILESELECT_FONT:
 
         for (i = 0; fsFontFileNames[i][0]; i++)
-            if (strcmp(str, fsFontFileNames[i][0]) == 0) {
+            if (strcmp(str, _(fsFontFileNames[i][0])) == 0) {
                 fsFilter = fsFontFileNames[i][1];
                 fsLastFontFilterSelected = i;
                 break;
@@ -492,7 +492,7 @@
     case FILESELECT_IMAGE:
 
         for (i = 0; fsImageFilterNames[i][0]; i++)
-            if (strcmp(str, fsImageFilterNames[i][0]) == 0) {
+            if (strcmp(str, _(fsImageFilterNames[i][0])) == 0) {
                 fsFilter = fsImageFilterNames[i][1];
                 fsLastImageFilterSelected = i;
                 break;
@@ -594,6 +594,9 @@
     (void)button;
     (void)user_data;
 
+    if (!fsSelectedFile)
+        fsSelectedFile = ".";
+
     if (chdir(fsSelectedFile) == 0) {
         gchar *utf8dir;
 
@@ -872,12 +875,12 @@
 
         for (i = 0; fsVideoAudioFilterNames[i][0]; i++)
             if ((strcmp(fsVideoAudioFilterNames[i][0], MSGTR_GUI_FilterFilePlaylist) != 0) || allow_playlist_parsing)
-                fsList_items = g_list_append(fsList_items, fsVideoAudioFilterNames[i][0]);
+                fsList_items = g_list_append(fsList_items, _(fsVideoAudioFilterNames[i][0]));
 
         k = fsLastVideoAudioFilterSelected;
         gtk_combo_set_popdown_strings(GTK_COMBO(List), fsList_items);
         g_list_free(fsList_items);
-        gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), fsVideoAudioFilterNames[k >= 0 ? k : i - 4][0]);
+        gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), _(fsVideoAudioFilterNames[k >= 0 ? k : i - 4][0]));
         //tmp=guiInfo.Filename;
         break;
 
@@ -886,12 +889,12 @@
         fsList_items = NULL;
 
         for (i = 0; fsSubtitleFilterNames[i][0]; i++)
-            fsList_items = g_list_append(fsList_items, fsSubtitleFilterNames[i][0]);
+            fsList_items = g_list_append(fsList_items, _(fsSubtitleFilterNames[i][0]));
 
         k = fsLastSubtitleFilterSelected;
         gtk_combo_set_popdown_strings(GTK_COMBO(List), fsList_items);
         g_list_free(fsList_items);
-        gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), fsSubtitleFilterNames[k >= 0 ? k : i - 2][0]);
+        gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), _(fsSubtitleFilterNames[k >= 0 ? k : i - 2][0]));
         tmp = guiInfo.SubtitleFilename;
         break;
 
@@ -900,12 +903,12 @@
         fsList_items = NULL;
 
         for (i = 0; fsAudioFileNames[i][0]; i++)
-            fsList_items = g_list_append(fsList_items, fsAudioFileNames[i][0]);
+            fsList_items = g_list_append(fsList_items, _(fsAudioFileNames[i][0]));
 
         k = fsLastAudioFilterSelected;
         gtk_combo_set_popdown_strings(GTK_COMBO(List), fsList_items);
         g_list_free(fsList_items);
-        gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), fsAudioFileNames[k >= 0 ? k : i - 2][0]);
+        gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), _(fsAudioFileNames[k >= 0 ? k : i - 2][0]));
         tmp = guiInfo.AudioFilename;
         break;
 
@@ -914,12 +917,12 @@
         fsList_items = NULL;
 
         for (i = 0; fsFontFileNames[i][0]; i++)
-            fsList_items = g_list_append(fsList_items, fsFontFileNames[i][0]);
+            fsList_items = g_list_append(fsList_items, _(fsFontFileNames[i][0]));
 
         k = fsLastFontFilterSelected;
         gtk_combo_set_popdown_strings(GTK_COMBO(List), fsList_items);
         g_list_free(fsList_items);
-        gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), fsFontFileNames[k >= 0 ? k : i - 2][0]);
+        gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), _(fsFontFileNames[k >= 0 ? k : i - 2][0]));
         tmp = font_name;
         break;
 
@@ -928,12 +931,12 @@
         fsList_items = NULL;
 
         for (i = 0; fsImageFilterNames[i][0]; i++)
-            fsList_items = g_list_append(fsList_items, fsImageFilterNames[i][0]);
+            fsList_items = g_list_append(fsList_items, _(fsImageFilterNames[i][0]));
 
         k = fsLastImageFilterSelected;
         gtk_combo_set_popdown_strings(GTK_COMBO(List), fsList_items);
         g_list_free(fsList_items);
-        gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), fsImageFilterNames[k >= 0 ? k : 0][0]);
+        gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), _(fsImageFilterNames[k >= 0 ? k : 0][0]));
         tmp = guiInfo.ImageFilename;
         break;
     }

MPlayer-1.2.r38170.tar.xz/gui/dialog/menu.c -> MPlayer-1.2.r38304.tar.xz/gui/dialog/menu.c Changed

@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #include "config.h"
 #include "help_mp.h"
@@ -131,6 +130,18 @@
  return Item;
 }
 
+static GtkWidget * AddMenuItemEllipsis( GtkWidget *Menu, const guint8 *icon, const char *label, int message )
+{
+ GtkWidget * item;
+ gchar * text;
+
+ text = g_strconcat( label,"…",NULL );
+ item = AddMenuItem( Menu,icon,text,message );
+ g_free( text );
+
+ return item;
+}
+
 static GtkWidget * AddSubMenu( GtkWidget *Menu, const guint8 *icon, const char *label )
 {
  GtkWidget * Label = NULL;
@@ -306,8 +317,8 @@
   { lng( 'q','u' ), "que", "Runa Simi"                       },
   { lng( 'r','m' ), "roh", "Rätoromanisch"                  },
   { lng( 'r','n' ), "run", "íkiRǔndi"                      },
-  { lng( 'r','o' ), "ron", "Română)"                       },
-  { lng( 'r','o' ), "rum", "Română)"                       },
+  { lng( 'r','o' ), "ron", "Română"                        },
+  { lng( 'r','o' ), "rum", "Română"                        },
   { lng( 'r','u' ), "rus", "Русский"                  },
   { lng( 'r','w' ), "kin", "Ikinyarwanda"                    },
   { lng( 's','c' ), "srd", "Sardu"                           },
@@ -319,7 +330,7 @@
   { lng( 's','l' ), "slv", "Slovenščina"                   },
   { lng( 's','m' ), "smo", "Gagana Sāmoa"                   },
   { lng( 's','n' ), "sna", "chiShona"                        },
-  { lng( 's','o' ), "som", "Af-ka Soomaali-ga"               },
+  { lng( 's','o' ), "som", "Afka Soomaaliga"                 },
   { lng( 's','q' ), "sqi", "Shqip"                           },
   { lng( 's','q' ), "alb", "Shqip"                           },
   { lng( 's','r' ), "srp", "Српски"                    },
@@ -396,8 +407,8 @@
     else if ( p[3] != 0) return language;
   }
  for ( i=0;i<sizeof( Languages ) / sizeof( Languages_t );i++ )
-  if ( type == GET_LANG_INT ? Languages[i].id == l : strncasecmp(Languages[i].id2, p, sizeof(Languages[i].id2)) == 0 ) return Languages[i].name;
- return MSGTR_GUI_Unknown;
+  if ( type == GET_LANG_INT ? Languages[i].id == l : av_strncasecmp(Languages[i].id2, p, sizeof(Languages[i].id2)) == 0 ) return Languages[i].name;
+ return _(MSGTR_GUI_Unknown);
 }
 #undef lng
 
@@ -427,68 +438,71 @@
  demuxer_t *demuxer = mpctx_get_demuxer(guiInfo.mpcontext);
  mixer_t *mixer = mpctx_get_mixer(guiInfo.mpcontext);
  int subs = 0, sub_pos;
+ gchar *trkfmt;
 
  Menu=gtk_menu_new();
  gtk_widget_realize (Menu);
 
-  AddMenuItem( Menu, about_png, MSGTR_GUI_AboutMPlayer, evAbout );
+ trkfmt = g_strconcat( _(MSGTR_GUI_TrackN), " - %s", NULL);
+
+  AddMenuItem( Menu, about_png, _(MSGTR_GUI_AboutMPlayer), evAbout );
   AddSeparator( Menu );
-   SubMenu=AddSubMenu( Menu, open_png, MSGTR_GUI_Open );
-    AddMenuItem( SubMenu, file_png, MSGTR_GUI_File ELLIPSIS, evLoadPlay );
+   SubMenu=AddSubMenu( Menu, open_png, _(MSGTR_GUI_Open) );
+    AddMenuItemEllipsis( SubMenu, file_png, _(MSGTR_GUI_File), evLoadPlay );
 #ifdef CONFIG_CDDA
-    AddMenuItem( SubMenu, cd_play_png, MSGTR_GUI_CD, evPlayCD );
-    CDSubMenu=AddSubMenu( Menu, cd_png, MSGTR_GUI_CD );
-    AddMenuItem( CDSubMenu, cd_play_png, MSGTR_GUI_Play, evPlayCD );
+    AddMenuItem( SubMenu, cd_play_png, _(MSGTR_GUI_CD), evPlayCD );
+    CDSubMenu=AddSubMenu( Menu, cd_png, _(MSGTR_GUI_CD) );
+    AddMenuItem( CDSubMenu, cd_play_png, _(MSGTR_GUI_Play), evPlayCD );
     AddSeparator( CDSubMenu );
-    CDTitleMenu=AddSubMenu( CDSubMenu, title_png, MSGTR_GUI_Titles );
+    CDTitleMenu=AddSubMenu( CDSubMenu, title_png, _(MSGTR_GUI_Titles) );
     if ( guiInfo.Tracks && ( guiInfo.StreamType == STREAMTYPE_CDDA ) )
      {
       char tmp[32]; int i;
       for ( i=1;i <= guiInfo.Tracks;i++ )
        {
-        snprintf( tmp,32,MSGTR_GUI_TitleNN,i );
+        snprintf( tmp,32,_(MSGTR_GUI_TitleNN),i );
         AddMenuCheckItem( CDTitleMenu, NULL, tmp, guiInfo.Track == i, ( i << 16 ) + ivSetCDTrack );
        }
      }
      else
       {
-       MenuItem=AddMenuItem( CDTitleMenu, NULL, MSGTR_GUI__none_, evNone );
+       MenuItem=AddMenuItem( CDTitleMenu, NULL, _(MSGTR_GUI__none_), evNone );
        gtk_widget_set_sensitive( MenuItem,FALSE );
       }
 #endif
 #ifdef CONFIG_VCD
-    AddMenuItem( SubMenu, vcd_play_png, MSGTR_GUI_VCD, evPlayVCD );
-    VCDSubMenu=AddSubMenu( Menu, vcd_png, MSGTR_GUI_VCD );
-    AddMenuItem( VCDSubMenu, vcd_play_png, MSGTR_GUI_Play, evPlayVCD );
+    AddMenuItem( SubMenu, vcd_play_png, _(MSGTR_GUI_VCD), evPlayVCD );
+    VCDSubMenu=AddSubMenu( Menu, vcd_png, _(MSGTR_GUI_VCD) );
+    AddMenuItem( VCDSubMenu, vcd_play_png, _(MSGTR_GUI_Play), evPlayVCD );
     AddSeparator( VCDSubMenu );
-    VCDTitleMenu=AddSubMenu( VCDSubMenu, title_png, MSGTR_GUI_Titles );
+    VCDTitleMenu=AddSubMenu( VCDSubMenu, title_png, _(MSGTR_GUI_Titles) );
     if ( guiInfo.Tracks && ( guiInfo.StreamType == STREAMTYPE_VCD ) )
      {
       char tmp[32]; int i;
       for ( i=1;i < guiInfo.Tracks;i++ )
        {
-        snprintf( tmp,32,MSGTR_GUI_TitleNN,i );
+        snprintf( tmp,32,_(MSGTR_GUI_TitleNN),i );
         AddMenuCheckItem( VCDTitleMenu, NULL, tmp, guiInfo.Track == i + 1, ( ( i + 1 ) << 16 ) + ivSetVCDTrack );
        }
      }
      else
       {
-       MenuItem=AddMenuItem( VCDTitleMenu, NULL, MSGTR_GUI__none_, evNone );
+       MenuItem=AddMenuItem( VCDTitleMenu, NULL, _(MSGTR_GUI__none_), evNone );
        gtk_widget_set_sensitive( MenuItem,FALSE );
       }
 #endif
 #ifdef CONFIG_DVDREAD
-    AddMenuItem( SubMenu, dvd_play_png, MSGTR_GUI_DVD, evPlayDVD );
-    DVDSubMenu=AddSubMenu( Menu, dvd_png, MSGTR_GUI_DVD );
-    AddMenuItem( DVDSubMenu, dvd_play_png, MSGTR_GUI_Play, evPlayDVD );
+    AddMenuItem( SubMenu, dvd_play_png, _(MSGTR_GUI_DVD), evPlayDVD );
+    DVDSubMenu=AddSubMenu( Menu, dvd_png, _(MSGTR_GUI_DVD) );
+    AddMenuItem( DVDSubMenu, dvd_play_png, _(MSGTR_GUI_Play), evPlayDVD );
     AddSeparator( DVDSubMenu );
-    DVDTitleMenu=AddSubMenu( DVDSubMenu, title_png, MSGTR_GUI_Titles );
+    DVDTitleMenu=AddSubMenu( DVDSubMenu, title_png, _(MSGTR_GUI_Titles) );
      if ( guiInfo.Tracks && ( guiInfo.StreamType == STREAMTYPE_DVD ) )
       {
        char tmp[32]; int i;
        for ( i=1 ; i<= guiInfo.Tracks;i++ )
         {
-         snprintf( tmp,32,MSGTR_GUI_TitleNN,i);
+         snprintf( tmp,32,_(MSGTR_GUI_TitleNN),i);
          AddMenuCheckItem( DVDTitleMenu, NULL, tmp,
          guiInfo.Track == i,
          (i << 16) + ivSetDVDTitle );
@@ -496,51 +510,51 @@
       }
       else
        {
-        MenuItem=AddMenuItem( DVDTitleMenu, NULL, MSGTR_GUI__none_, evNone );
+        MenuItem=AddMenuItem( DVDTitleMenu, NULL, _(MSGTR_GUI__none_), evNone );
         gtk_widget_set_sensitive( MenuItem,FALSE );
        }
-    DVDChapterMenu=AddSubMenu( DVDSubMenu, chapter_png, MSGTR_GUI_Chapters );
+    DVDChapterMenu=AddSubMenu( DVDSubMenu, chapter_png, _(MSGTR_GUI_Chapters) );
      if ( guiInfo.Chapters && ( guiInfo.StreamType == STREAMTYPE_DVD ) )
       {
        char tmp[32]; int i;
        for ( i=1;i <= guiInfo.Chapters;i++ )
         {
-         snprintf( tmp,32,MSGTR_GUI_ChapterNN,i );
+         snprintf( tmp,32,_(MSGTR_GUI_ChapterNN),i );
          AddMenuCheckItem( DVDChapterMenu, NULL, tmp, guiInfo.Chapter == i,
          ( i << 16 ) + ivSetDVDChapter );
         }
       }
       else
        {
-        MenuItem=AddMenuItem( DVDChapterMenu, NULL, MSGTR_GUI__none_, evNone );
+        MenuItem=AddMenuItem( DVDChapterMenu, NULL, _(MSGTR_GUI__none_), evNone );
         gtk_widget_set_sensitive( MenuItem,FALSE );
        }
 #endif
 #if defined(CONFIG_LIBCDIO) || defined(CONFIG_DVDREAD)
-    AddMenuItem( SubMenu, image_png, MSGTR_GUI_Image ELLIPSIS, evPlayImage );
+    AddMenuItemEllipsis( SubMenu, image_png, _(MSGTR_GUI_Image), evPlayImage );
 #endif
-    AddMenuItem( SubMenu, url_png, MSGTR_GUI_URL ELLIPSIS, evLoadURL );
+    AddMenuItemEllipsis( SubMenu, url_png, _(MSGTR_GUI_URL), evLoadURL );
 #ifdef CONFIG_TV
-    AddMenuItem( SubMenu, tv_png, MSGTR_GUI_TV, evPlayTV );
+    AddMenuItem( SubMenu, tv_png, _(MSGTR_GUI_TV), evPlayTV );
 #endif
     AddSeparator( SubMenu );
-    D = AddMenuItem( SubMenu, audio_track_load_png, MSGTR_GUI_AudioTrack ELLIPSIS, evLoadAudioFile );
+    D = AddMenuItemEllipsis( SubMenu, audio_track_load_png, _(MSGTR_GUI_AudioTrack), evLoadAudioFile );
     gtk_widget_set_sensitive( D, !guiInfo.Playing );
-    D = AddMenuItem( SubMenu, subtitle_load_png, MSGTR_GUI_Subtitle ELLIPSIS, evLoadSubtitle );
+    D = AddMenuItemEllipsis( SubMenu, subtitle_load_png, _(MSGTR_GUI_Subtitle), evLoadSubtitle );
     gtk_widget_set_sensitive( D, !guiInfo.Playing );
-   SubMenu=AddSubMenu( Menu, play_png, MSGTR_GUI_Playback );
-    D = AddMenuItem( SubMenu, play_png, MSGTR_GUI_Play, evPlay );
-    F = AddMenuItem( SubMenu, play_pause_png, MSGTR_GUI_Pause, evPause );
-    H = AddMenuItem( SubMenu, play_stop_png, MSGTR_GUI_Stop, evStop );
-    N = AddMenuItem( SubMenu, play_next_png, MSGTR_GUI_Next, evNext );

MPlayer-1.2.r38170.tar.xz/gui/dialog/msgbox.c -> MPlayer-1.2.r38304.tar.xz/gui/dialog/msgbox.c Changed

MPlayer-1.2.r38170.tar.xz/gui/dialog/playlist.c -> MPlayer-1.2.r38304.tar.xz/gui/dialog/playlist.c Changed

@@ -459,7 +459,7 @@
 
   Playlist=gtk_window_new( GTK_WINDOW_TOPLEVEL );
   gtk_widget_set_usize(Playlist, 640, 480);
-  gtk_window_set_title( GTK_WINDOW( Playlist ),MSGTR_GUI_Playlist );
+  gtk_window_set_title( GTK_WINDOW( Playlist ),_(MSGTR_GUI_Playlist) );
   gtk_window_set_position( GTK_WINDOW( Playlist ),GTK_WIN_POS_CENTER );
   gtk_window_set_wmclass( GTK_WINDOW( Playlist ),"Playlist",MPlayer );
 
@@ -504,7 +504,7 @@
   else if ( fsHistory[0] ) old_path = strdup( cfg_old_filename_from_utf8( fsHistory[0] ) );
 
   gtk_clist_set_column_widget( GTK_CLIST( CTDirTree ),0,
-    gtkAddLabel( MSGTR_GUI_DirectoryTree,NULL ) );
+    gtkAddLabel( _(MSGTR_GUI_DirectoryTree),NULL ) );
 
   gtk_clist_column_title_passive( GTK_CLIST( CTDirTree ),0 );
 
@@ -526,7 +526,7 @@
   gtk_clist_set_shadow_type( GTK_CLIST( CLFiles ),GTK_SHADOW_NONE );
 
   gtk_clist_set_column_widget( GTK_CLIST( CLFiles ),0,
-    gtkAddLabel( MSGTR_GUI_Files,NULL ) );
+    gtkAddLabel( _(MSGTR_GUI_Files),NULL ) );
 
   gtk_clist_column_title_passive( GTK_CLIST( CLFiles ),0 );
 
@@ -547,10 +547,10 @@
   gtk_clist_set_shadow_type( GTK_CLIST( CLSelected ),GTK_SHADOW_NONE );
 
   gtk_clist_set_column_widget( GTK_CLIST( CLSelected ),0,
-    gtkAddLabel( MSGTR_GUI_SelectedFiles,NULL ) );
+    gtkAddLabel( _(MSGTR_GUI_SelectedFiles),NULL ) );
 
   gtk_clist_set_column_widget( GTK_CLIST( CLSelected ),1,
-    gtkAddLabel( MSGTR_GUI_Directory,NULL ) );
+    gtkAddLabel( _(MSGTR_GUI_Directory),NULL ) );
 
   gtk_clist_column_title_passive( GTK_CLIST( CLSelected ),0 );
 
@@ -560,10 +560,10 @@
     gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END );
     gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 );
 
-  Add=gtkAddButton( MSGTR_GUI_Add,hbuttonbox1 );
-  Remove=gtkAddButton( MSGTR_GUI_Remove,hbuttonbox1 );
-  Ok=gtkAddButton( MSGTR_GUI_Ok,hbuttonbox1 );
-  Cancel=gtkAddButton( MSGTR_GUI_Cancel,hbuttonbox1 );
+  Add=gtkAddButton( _(MSGTR_GUI_Add),hbuttonbox1 );
+  Remove=gtkAddButton( _(MSGTR_GUI_Remove),hbuttonbox1 );
+  Ok=gtkAddButton( _(MSGTR_GUI_Ok),hbuttonbox1 );
+  Cancel=gtkAddButton( _(MSGTR_GUI_Cancel),hbuttonbox1 );
 
   gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );

MPlayer-1.2.r38170.tar.xz/gui/dialog/preferences.c -> MPlayer-1.2.r38304.tar.xz/gui/dialog/preferences.c Changed

@@ -21,12 +21,12 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>
-#include <strings.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "help_mp.h"
 #include "mixer.h"
 #include "mpcommon.h"
@@ -238,7 +238,7 @@
    case 0: // font encoding
         comment=gtk_entry_get_text( GTK_ENTRY( EFontEncoding ) );
         for ( i=0;lEncoding[i].name;i++ )
-          if ( !gstrcmp( lEncoding[i].comment,comment ) ) break;
+          if ( !gstrcmp( _(lEncoding[i].comment),comment ) ) break;
         if ( lEncoding[i].comment ) mplayer( MPLAYER_SET_FONT_ENCODING,0,lEncoding[i].name );
         else mplayer( MPLAYER_SET_FONT_ENCODING,0,(char *)comment );
         break;
@@ -247,11 +247,11 @@
    case 1: // sub encoding
         comment=gtk_entry_get_text( GTK_ENTRY( ESubEncoding ) );
         for ( i=0;lEncoding[i].name;i++ )
-          if ( !gstrcmp( lEncoding[i].comment,comment ) ) break;
+          if ( !gstrcmp( _(lEncoding[i].comment),comment ) ) break;
         if ( lEncoding[i].comment ) mplayer( MPLAYER_SET_SUB_ENCODING,0,lEncoding[i].name );
         else
         {
-         if ( strcmp( comment,MSGTR_GUI__Default_ ) == 0 ) comment=NULL;
+         if ( strcmp( comment,_(MSGTR_GUI__Default_) ) == 0 ) comment=NULL;
          mplayer( MPLAYER_SET_SUB_ENCODING,0,(char *)comment );
         }
         if ( !comment) gtk_widget_set_sensitive( CBSubEncoding,(!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(CBSubUtf8)) && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(CBSubUnicode))) );
@@ -376,7 +376,7 @@
 
         /* 6th page */
         gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) );
-        gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) );
+        fullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) );
         gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) );
         gtkShowVideoWindow=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) );
         stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) );
@@ -397,7 +397,7 @@
 
         if ( guiInfo.Playing && inform )
          {
-          gtkMessageBox( MSGBOX_INFORMATION,MSGTR_GUI_MSG_PlaybackNeedsRestart );
+          gtkMessageBox( MSGBOX_INFORMATION,_(MSGTR_GUI_MSG_PlaybackNeedsRestart) );
           inform = False;
          }
 
@@ -629,7 +629,7 @@
   accel_group=gtk_accel_group_new();
 
   Preferences=gtk_window_new( GTK_WINDOW_TOPLEVEL );
-  gtk_window_set_title( GTK_WINDOW( Preferences ),MSGTR_GUI_Preferences );
+  gtk_window_set_title( GTK_WINDOW( Preferences ),_(MSGTR_GUI_Preferences) );
   gtk_window_set_position( GTK_WINDOW( Preferences ),GTK_WIN_POS_CENTER );
   gtk_window_set_wmclass( GTK_WINDOW( Preferences ),"Preferences",MPlayer );
 
@@ -663,9 +663,9 @@
   gtk_clist_set_shadow_type( GTK_CLIST( CLADrivers ),GTK_SHADOW_NONE );
   gtk_widget_set_usize( CLADrivers,250,-2 );
   gtk_clist_set_column_widget( GTK_CLIST( CLADrivers ),0,
-    gtkAddLabel( MSGTR_GUI_AvailableDrivers,NULL ) );
+    gtkAddLabel( _(MSGTR_GUI_AvailableDrivers),NULL ) );
 
-  AConfig=gtkAddButton( MSGTR_GUI_ConfigureDriver,
+  AConfig=gtkAddButton( _(MSGTR_GUI_ConfigureDriver),
     gtkAddHButtonBox( vbox2 ) );
 
   vbox3=gtkAddVBox(
@@ -674,39 +674,39 @@
     gtk_widget_set_usize( vbox3,250,-2 );
 
   hbox10 = gtkAddHBox(vbox3, 1);
-  CBReplayGain = gtkAddCheckButton(MSGTR_GUI_ReplayGain, hbox10);
+  CBReplayGain = gtkAddCheckButton(_(MSGTR_GUI_ReplayGain), hbox10);
   RGbox = gtkAddHBox(hbox10, 1);
-  gtkAddLabel(MSGTR_GUI_ReplayGainAdjustment, RGbox);
+  gtkAddLabel(_(MSGTR_GUI_ReplayGainAdjustment), RGbox);
   RGadj = gtk_adjustment_new(gtkReplayGainAdjustment, -30, 10, 1, 5, 0);
   RGspin = gtk_spin_button_new(GTK_ADJUSTMENT(RGadj), 1, 0);
   gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(RGspin), TRUE);
   gtk_box_pack_start(GTK_BOX(RGbox), GTK_WIDGET(RGspin), FALSE, FALSE, 0);
-  gtkAddLabel(MSGTR_GUI_dB, RGbox);
+  gtkAddLabel(_(MSGTR_GUI_dB), RGbox);
   gtk_widget_set_sensitive(RGbox, gtkReplayGainOn);
   gtk_widget_show(RGspin);
 
-  CBNormalize=gtkAddCheckButton( MSGTR_GUI_NormalizeSound,vbox3 );
-  CBAudioEqualizer=gtkAddCheckButton( MSGTR_GUI_EnableEqualizer,vbox3 );
-  CBSoftwareMixer=gtkAddCheckButton( MSGTR_GUI_EnableSoftwareMixer,vbox3 );
+  CBNormalize=gtkAddCheckButton( _(MSGTR_GUI_NormalizeSound),vbox3 );
+  CBAudioEqualizer=gtkAddCheckButton( _(MSGTR_GUI_EnableEqualizer),vbox3 );
+  CBSoftwareMixer=gtkAddCheckButton( _(MSGTR_GUI_EnableSoftwareMixer),vbox3 );
 #if 0
   CBSurround=gtkAddCheckButton( "Enable surround",vbox3 );
 #endif
 
   gtkAddHSeparator( vbox3 );
-  CBExtraStereo=gtkAddCheckButton( MSGTR_GUI_EnableExtraStereo,vbox3 );
+  CBExtraStereo=gtkAddCheckButton( _(MSGTR_GUI_EnableExtraStereo),vbox3 );
   hbox8=gtkAddHBox( vbox3,1 );
-  /*label=*/gtkAddLabel( MSGTR_GUI_Coefficient":",hbox8 );
+  /*label=*/gtkAddLabelColon( _(MSGTR_GUI_Coefficient),hbox8 );
 //    gtk_misc_set_padding( GTK_MISC( label ),20,0 );
   HSExtraStereoMuladj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10,10,0.1,0,0 ) );
   HSExtraStereoMul=gtkAddHScale( HSExtraStereoMuladj,hbox8,1 );
   gtkAddHSeparator( vbox3 );
 
   hbox8=gtkAddHBox( vbox3,1 );
-  gtkAddLabel( MSGTR_GUI_AudioDelay":",hbox8 );
+  gtkAddLabelColon( _(MSGTR_GUI_AudioDelay),hbox8 );
 
   HSAudioDelayadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,0.1,0,0 ) );
   HSAudioDelay=gtkAddHScale( HSAudioDelayadj,hbox8,1 );
-  label=gtkAddLabel( MSGTR_GUI_Audio,NULL );
+  label=gtkAddLabel( _(MSGTR_GUI_Audio),NULL );
     gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),0 ),label );
 
 /* 2nd page */
@@ -730,31 +730,31 @@
   gtk_clist_set_shadow_type( GTK_CLIST( CLVDrivers ),GTK_SHADOW_NONE );
   gtk_widget_set_usize( CLVDrivers,250,-2 );
 
-  label=gtkAddLabel( MSGTR_GUI_AvailableDrivers,NULL );
+  label=gtkAddLabel( _(MSGTR_GUI_AvailableDrivers),NULL );
     gtk_clist_set_column_widget( GTK_CLIST( CLVDrivers ),0,label );
 
   hbuttonbox3=gtkAddHButtonBox( vbox4 );
-  VConfig=gtkAddButton( MSGTR_GUI_ConfigureDriver,hbuttonbox3 );
+  VConfig=gtkAddButton( _(MSGTR_GUI_ConfigureDriver),hbuttonbox3 );
 
   vbox5=gtkAddVBox(
     gtkAddFrame( NULL,GTK_SHADOW_NONE,
       gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox2,0 ),1 ),0 );
     gtk_widget_set_usize( vbox5,250,-2 );
 
-  CBDoubleBuffer=gtkAddCheckButton( MSGTR_GUI_EnableDoubleBuffering,vbox5 );
-  CBDR=gtkAddCheckButton( MSGTR_GUI_EnableDirectRendering,vbox5 );
-  CBFramedrop=gtkAddCheckButton( MSGTR_GUI_EnableFrameDropping,vbox5 );
-  CBHFramedrop=gtkAddCheckButton( MSGTR_GUI_EnableFrameDroppingIntense,vbox5 );
-  CBFlip=gtkAddCheckButton( MSGTR_GUI_Flip,vbox5 );
+  CBDoubleBuffer=gtkAddCheckButton( _(MSGTR_GUI_EnableDoubleBuffering),vbox5 );
+  CBDR=gtkAddCheckButton( _(MSGTR_GUI_EnableDirectRendering),vbox5 );
+  CBFramedrop=gtkAddCheckButton( _(MSGTR_GUI_EnableFrameDropping),vbox5 );
+  CBHFramedrop=gtkAddCheckButton( _(MSGTR_GUI_EnableFrameDroppingIntense),vbox5 );
+  CBFlip=gtkAddCheckButton( _(MSGTR_GUI_Flip),vbox5 );
 
   table1=gtk_table_new( 2,2,FALSE );
   gtk_widget_show( table1 );
   gtk_box_pack_start( GTK_BOX( vbox5 ),table1,FALSE,FALSE,0 );
 
-  label=gtkAddLabel( MSGTR_GUI_PanAndScan":",NULL );
+  label=gtkAddLabelColon( _(MSGTR_GUI_PanAndScan),NULL );
     gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
-  label=gtkAddLabel( MSGTR_GUI_FrameRate":",NULL );
+  label=gtkAddLabelColon( _(MSGTR_GUI_FrameRate),NULL );
     gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   HSPanscanadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,1,0.1,0,0 ) );
@@ -767,7 +767,7 @@
     gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( HSFPS ),TRUE );
     gtk_table_attach( GTK_TABLE( table1 ),HSFPS,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
-  label=gtkAddLabel( MSGTR_GUI_Video,NULL );
+  label=gtkAddLabel( _(MSGTR_GUI_Video),NULL );
     gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),1 ),label );
 
 /* 3rd page */
@@ -776,21 +776,21 @@
 
   vbox600=gtkAddVBox(
     gtkAddFrame( NULL,GTK_SHADOW_NONE,
-      gtkAddFrame( MSGTR_GUI_OsdLevel,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 );
+      gtkAddFrame( _(MSGTR_GUI_OsdLevel),GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 );
 
-  RBOSDNone=gtkAddRadioButton( MSGTR_GUI_OsdLevel0,&OSD_group,vbox600 );
-  RBOSDIndicator=gtkAddRadioButton( MSGTR_GUI_OsdLevel1,&OSD_group,vbox600 );
-  RBOSDTandP=gtkAddRadioButton( MSGTR_GUI_OsdLevel2,&OSD_group,vbox600 );
-  RBOSDTPTT=gtkAddRadioButton( MSGTR_GUI_OsdLevel3,&OSD_group,vbox600 );
+  RBOSDNone=gtkAddRadioButton( _(MSGTR_GUI_OsdLevel0),&OSD_group,vbox600 );
+  RBOSDIndicator=gtkAddRadioButton( _(MSGTR_GUI_OsdLevel1),&OSD_group,vbox600 );
+  RBOSDTandP=gtkAddRadioButton( _(MSGTR_GUI_OsdLevel2),&OSD_group,vbox600 );
+  RBOSDTPTT=gtkAddRadioButton( _(MSGTR_GUI_OsdLevel3),&OSD_group,vbox600 );
 
   vbox7=gtkAddVBox(
     gtkAddFrame( NULL,GTK_SHADOW_NONE,
-      gtkAddFrame( MSGTR_GUI_Subtitle,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 );
+      gtkAddFrame( _(MSGTR_GUI_Subtitle),GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 );
 
 #if 0
   hbox4=gtkAddHBox( vbox7,1 );

MPlayer-1.2.r38170.tar.xz/gui/dialog/skinbrowser.c -> MPlayer-1.2.r38304.tar.xz/gui/dialog/skinbrowser.c Changed

@@ -40,8 +40,7 @@
 char      * sbSkinDirInHome=NULL;
 char      * sbSkinDirInData=NULL;
 
-char * gtkOldSkin=NULL;
-static char * prev=NULL;
+static char *prevSelected;
 
 GtkWidget * SkinBrowser = NULL;
 
@@ -54,10 +53,9 @@
   switch ( GPOINTER_TO_INT(user_data) )
    {
     case 0: // cancel
-      if ( strcmp( sbSelectedSkin,gtkOldSkin ) ) uiChangeSkin( gtkOldSkin );
+      if ( strcmp( sbSelectedSkin,skinName ) ) uiChangeSkin( skinName );
       break;
    case 1: // ok
-      uiChangeSkin( sbSelectedSkin );   // NOTE TO MYSELF: skin already changed!
       free( skinName );
       skinName=strdup( sbSelectedSkin );
       break;
@@ -72,9 +70,9 @@
  (void) user_data;
 
  gtk_clist_get_text( clist,row,0,&sbSelectedSkin );
- if ( strcmp( prev,sbSelectedSkin ) )
+ if ( strcmp( prevSelected,sbSelectedSkin ) )
   {
-   prev=sbSelectedSkin;
+   prevSelected=sbSelectedSkin;
    uiChangeSkin( sbSelectedSkin );
    gtkRaise( SkinBrowser );
   }
@@ -87,7 +85,7 @@
   }
 }
 
-static GtkWidget * CreateSkinBrowser( void )
+void ShowSkinBrowser( void )
 {
  GtkWidget     * vbox5;
  GtkWidget     * scrolledwindow1;
@@ -102,7 +100,7 @@
  gtk_widget_set_usize( SkinBrowser,256,320 );
  gtk_container_set_border_width( GTK_CONTAINER( SkinBrowser ),1 );
  gtk_widget_set_events( SkinBrowser,GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK );
- gtk_window_set_title( GTK_WINDOW( SkinBrowser ),MSGTR_GUI_SkinBrowser );
+ gtk_window_set_title( GTK_WINDOW( SkinBrowser ),_(MSGTR_GUI_SkinBrowser) );
  gtk_window_set_position( GTK_WINDOW( SkinBrowser ),GTK_WIN_POS_CENTER );
  gtk_window_set_policy( GTK_WINDOW( SkinBrowser ),FALSE,FALSE,TRUE );
  gtk_window_set_wmclass( GTK_WINDOW( SkinBrowser ),"SkinBrowser",MPlayer );
@@ -129,7 +127,7 @@
  gtk_clist_set_selection_mode( GTK_CLIST( SkinList ),GTK_SELECTION_SINGLE );
  gtk_clist_column_titles_show( GTK_CLIST( SkinList ) );
  gtk_clist_set_shadow_type( GTK_CLIST( SkinList ),GTK_SHADOW_ETCHED_OUT );
- gtk_clist_set_column_widget( GTK_CLIST( SkinList ),0, gtkAddLabel( MSGTR_GUI_AvailableSkins,NULL ) );
+ gtk_clist_set_column_widget( GTK_CLIST( SkinList ),0, gtkAddLabel( _(MSGTR_GUI_AvailableSkins),NULL ) );
 
  gtkAddHSeparator( vbox5 );
 
@@ -137,8 +135,8 @@
   gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox4 ),GTK_BUTTONBOX_SPREAD );
   gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox4 ),10 );
 
- Ok=gtkAddButton( MSGTR_GUI_Ok,hbuttonbox4 );
- Cancel=gtkAddButton( MSGTR_GUI_Cancel,hbuttonbox4 );
+ Ok=gtkAddButton( _(MSGTR_GUI_Ok),hbuttonbox4 );
+ Cancel=gtkAddButton( _(MSGTR_GUI_Cancel),hbuttonbox4 );
 
  gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
  gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
@@ -154,44 +152,35 @@
   { strcpy( sbSkinDirInData,skinDirInData ); strcat( sbSkinDirInData,"/*" ); }
 
  gtk_window_add_accel_group( GTK_WINDOW( SkinBrowser ),accel_group );
- gtk_widget_grab_focus( SkinList );
+ gtk_widget_grab_focus( scrolledwindow1 );
 
- return SkinBrowser;
-}
-
-void ShowSkinBrowser( void )
-{
- if ( SkinBrowser ) gtkRaise( SkinBrowser );
-   else SkinBrowser=CreateSkinBrowser();
+ prevSelected = skinName;
+ gtk_widget_show(SkinBrowser);
 }
 
 int FillSkinList( gchar * mdir )
 {
- gchar         * str[2];
+ gchar         * str[1];
  gchar         * tmp;
  size_t          i;
  glob_t          gg;
  struct stat     fs;
 
- gtkOldSkin=strdup( skinName );
- prev=gtkOldSkin;
-
- str[0]="default";
- str[1]="";
- if ( gtkFindInCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str );
-
  glob( mdir,GLOB_NOSORT,NULL,&gg );
  for( i=0;i<gg.gl_pathc;i++ )
   {
    if ( !strcmp( gg.gl_pathv[i],"." ) || !strcmp( gg.gl_pathv[i],".." ) ) continue;
-   if ( ( stat( gg.gl_pathv[i],&fs ) == 0 ) && S_ISDIR( fs.st_mode ) )
+   if ( ( lstat( gg.gl_pathv[i],&fs ) == 0 ) )
     {
      tmp=strrchr( gg.gl_pathv[i],'/' );
      if (tmp) tmp++;
      else tmp = gg.gl_pathv[i];
-     if ( !strcmp( tmp,"default" ) ) continue;
-     str[0]=tmp;
-     if ( gtkFindInCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str );
+     // only directories or a link named "default"
+     if ( S_ISDIR( fs.st_mode ) || ( ( fs.st_mode & S_IFMT ) == S_IFLNK  && strcmp( tmp,"default" ) == 0 ) )
+      {
+       str[0]=tmp;
+       if ( gtkFindInCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str );
+      }
     }
   }
  globfree( &gg );

MPlayer-1.2.r38170.tar.xz/gui/dialog/skinbrowser.h -> MPlayer-1.2.r38304.tar.xz/gui/dialog/skinbrowser.h Changed

MPlayer-1.2.r38170.tar.xz/gui/dialog/tools.c -> MPlayer-1.2.r38304.tar.xz/gui/dialog/tools.c Changed

@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include "tools.h"
+#include "gui/app/gui.h"
 
 #include "help_mp.h"
 
@@ -37,7 +38,7 @@
  */
 static gchar *scale_format_value (GtkScale *scale, gdouble value, gpointer user_data)
 {
-  gchar *val, *p, *dm = MSGTR_GUI_DecimalMark;
+  gchar *val, *p, *dm = _(MSGTR_GUI_DecimalMark);
 
   (void) user_data;
 
@@ -89,6 +90,18 @@
  return label;
 }
 
+GtkWidget * gtkAddLabelColon( const char * title,GtkWidget * parent )
+{
+ GtkWidget * label;
+ gchar * text;
+
+ text = g_strconcat( title,":",NULL );
+ label = gtkAddLabel( text,parent );
+ g_free( text );
+
+ return label;
+}
+
 GtkWidget * gtkAddVBox( GtkWidget * parent,int type )
 {
  GtkWidget * vbox;
@@ -148,6 +161,18 @@
  return SB;
 }
 
+GtkWidget * gtkAddSpinButtonColon( const char * title,GtkAdjustment * adj,GtkWidget * parent )
+{
+ GtkWidget * button;
+ gchar * text;
+
+ text = g_strconcat( title,":",NULL );
+ button = gtkAddSpinButton( text,adj,parent );
+ g_free( text );
+
+ return button;
+}
+
 GtkWidget * gtkAddButton( const char * title,GtkWidget * parent )
 {
  GtkWidget * B;

MPlayer-1.2.r38170.tar.xz/gui/dialog/tools.h -> MPlayer-1.2.r38304.tar.xz/gui/dialog/tools.h Changed

MPlayer-1.2.r38170.tar.xz/gui/dialog/url.c -> MPlayer-1.2.r38304.tar.xz/gui/dialog/url.c Changed

MPlayer-1.2.r38170.tar.xz/gui/interface.c -> MPlayer-1.2.r38304.tar.xz/gui/interface.c Changed

@@ -78,6 +78,7 @@
     .PlaylistNext = True
 };
 
+static int skin;
 static int current_volume;
 static int guiInitialized;
 static int orig_fontconfig;
@@ -137,7 +138,7 @@
         vf_settings[0].attribs = listDup(argvf);
     }
 
-    mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_AddingVideoFilter, vf);
+    mp_msg(MSGT_GPLAYER, MSGL_INFO, _(MSGTR_GUI_MSG_AddingVideoFilter), vf);
 }
 
 /**
@@ -181,7 +182,7 @@
             if (strcmp(vf_settings[i].name, vf) == 0) {
                 int j;
 
-                mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_RemovingVideoFilter, vf);
+                mp_msg(MSGT_GPLAYER, MSGL_INFO, _(MSGTR_GUI_MSG_RemovingVideoFilter), vf);
 
                 free(vf_settings[i].name);
                 listFree(&vf_settings[i].attribs);
@@ -225,6 +226,13 @@
 
     mp_msg(MSGT_GPLAYER, MSGL_V, "GUI init.\n");
 
+#ifdef ENABLE_NLS
+    setlocale(LC_MESSAGES, "");
+    bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+    textdomain(GETTEXT_PACKAGE);
+#endif
+
     /* check options */
 
     if (!cdrom_device)
@@ -268,25 +276,36 @@
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #1: %s\n", skinDirInHome);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #2: %s\n", skinDirInData);
 
-    if (!skinName)
+    skin = (skinName != NULL);
+
+    if (!skin)
         skinName = strdup("default");
 
     ret = skinRead(skinName);
 
     if (ret == -1 && strcmp(skinName, "default") != 0) {
-        mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_SkinCfgSelectedNotFound, skinName);
+        mp_msg(MSGT_GPLAYER, MSGL_WARN, _(MSGTR_GUI_MSG_SkinCfgSelectedNotFound), skinName);
 
-        skinName = strdup("default");
-        ret      = skinRead(skinName);
+        setdup(&skinName, "default");
+        ret = skinRead(skinName);
     }
 
     switch (ret) {
     case -1:
-        gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgNotFound, skinName);
-        mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
+        if (skin) {
+            gmp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MSG_SkinCfgNotFound), skinName);
+            mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
+        } else {
+            if (skinRead("Noskin") != 0)
+                mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
+
+            gtkMessageBox(MSGBOX_WARNING | MSGBOX_WAIT, _(MSGTR_GUI_MSG_NoSkinInstalled));
+            setdup(&skinName, "");
+            break;
+        }
 
     case -2:
-        gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgError, skinName);
+        gmp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MSG_SkinCfgError), skinName);
         mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
     }
 
@@ -339,13 +358,15 @@
 
         guiInfo.VideoWindow = True;
 
-        if (gtkLoadFullscreen)
+        if (fullscreen)
             uiFullScreen();
     } else
         wsWindowBackground(&guiApp.videoWindow, 0, 0, 0);
 
-    if (gtkLoadFullscreen)
+    if (fullscreen) {
+        guiApp.videoWindow.isFullScreen = True;
         btnSet(evFullScreen, btnPressed);
+    }
 
     guiInfo.Playing = GUI_STOP;
 
@@ -633,7 +654,7 @@
         }
 
         if (!video_driver_list && !video_driver_list[0]) {
-            gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_VideoOutError);
+            gmp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MSG_VideoOutError));
             mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
         }
 
@@ -894,7 +915,7 @@
         btnSet(evSetMoviePosition, state);
 
         if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (((demuxer_t *)mpctx_get_demuxer(guiInfo.mpcontext))->file_format != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) {
-            gtkMessageBox(MSGBOX_FATAL, MSGTR_GUI_MSG_DXR3NeedsLavc);
+            gtkMessageBox(MSGBOX_FATAL, _(MSGTR_GUI_MSG_DXR3NeedsLavc));
             return False;
         }
 
@@ -977,20 +998,14 @@
         if (guiInfo.Start)
             uiAbsSeek(guiInfo.Start);
 
-        // These must be done here (in the last call from MPlayer before
-        // playback starts) and not in GUI_SETUP_VIDEO_WINDOW, because...
-
-        // ...without video there will be no call to GUI_SETUP_VIDEO_WINDOW
+        // This must be done here (in the last call from MPlayer before
+        // playback starts) and not in GUI_SETUP_VIDEO_WINDOW, because
+        // without video there will be no call to GUI_SETUP_VIDEO_WINDOW
         if (!guiInfo.VideoWindow) {
             wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
-            btnSet(evFullScreen, gtkLoadFullscreen ? btnPressed : btnReleased);
+            btnSet(evFullScreen, fullscreen ? btnPressed : btnReleased);
         }
 
-        // ...option variable fullscreen determines whether MPlayer will handle
-        //    the window given by WinID as fullscreen window (and will do aspect
-        //    scaling then) or not - quite rubbish
-        fullscreen = gtkLoadFullscreen;
-
         break;
 
     case GUI_SET_VOLUME_BALANCE:
@@ -1025,7 +1040,7 @@
                 wsWindowVisibility(&guiApp.videoWindow, wsShowWindow);
         }
 
-        if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
+        if (fullscreen ^ guiApp.videoWindow.isFullScreen)
             uiEvent(evFullScreen, True);
 
         if (guiWinID >= 0)
@@ -1139,12 +1154,12 @@
                 if (!guiApp.videoWindow.Mapped)
                     wsWindowVisibility(&guiApp.videoWindow, wsShowWindow);
 
-                if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
+                if (fullscreen ^ guiApp.videoWindow.isFullScreen)
                     uiEvent(evFullScreen, -1);
             } else {
                 wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
                 guiInfo.VideoWindow = False;
-                btnSet(evFullScreen, gtkLoadFullscreen ? btnPressed : btnReleased);
+                btnSet(evFullScreen, fullscreen ? btnPressed : btnReleased);
             }
 
             gui(GUI_SET_STATE, (void *)GUI_STOP);
@@ -1289,7 +1304,7 @@
             vo_font = read_font_desc(font_name, font_factor, 0);
 
             if (!vo_font)
-                gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadFont, font_name);
+                gmp_msg(MSGT_GPLAYER, MSGL_ERR, _(MSGTR_GUI_CantLoadFont), font_name);
         } else {
             char *fname = get_path("font/font.desc");
 
@@ -1395,19 +1410,19 @@
 void mplayerLoadSubtitle(const char *name)
 {
     if (subdata) {
-        mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_RemovingSubtitle);
+        mp_msg(MSGT_GPLAYER, MSGL_INFO, _(MSGTR_GUI_MSG_RemovingSubtitle));
 
         sub_free(subdata);
         subdata = NULL;
     }
 
     if (name) {
-        mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_LoadingSubtitle, name);
+        mp_msg(MSGT_GPLAYER, MSGL_INFO, _(MSGTR_GUI_MSG_LoadingSubtitle), name);
 
         subdata = sub_read_file(name, guiInfo.sh_video ? guiInfo.sh_video->fps : 25);
 
         if (!subdata) {
-            gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub, name);
+            gmp_msg(MSGT_GPLAYER, MSGL_ERR, _(MSGTR_GUI_CantLoadSub), name);
             return;
         }

MPlayer-1.2.r38170.tar.xz/gui/skin/skin.c -> MPlayer-1.2.r38304.tar.xz/gui/skin/skin.c Changed

@@ -31,6 +31,7 @@
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/dialog/dialog.h"
+#include "gui/util/bitmap.h"
 #include "gui/util/misc.h"
 #include "gui/util/string.h"
 
@@ -73,16 +74,16 @@
         p = strchr(data, ',');
 
         if (p)
-            mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_SkinLegacy, linenumber, p, "font = fontfile");
+            mp_msg(MSGT_GPLAYER, MSGL_INFO, _(MSGTR_GUI_MSG_SkinLegacy), linenumber, p, "font = fontfile");
     } else if (strcmp(old, "$l") == 0) {
         p = strstr(old, data);
 
         if (p && (p == data || p[-1] != '$'))
-            mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_SkinLegacy, linenumber, old, "$p");
+            mp_msg(MSGT_GPLAYER, MSGL_INFO, _(MSGTR_GUI_MSG_SkinLegacy), linenumber, old, "$p");
     } else if (strcmp(old, "evSetURL") == 0 && strcmp(data, old) == 0)
-        mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_SkinLegacy, linenumber, old, "evLoadURL");
+        mp_msg(MSGT_GPLAYER, MSGL_INFO, _(MSGTR_GUI_MSG_SkinLegacy), linenumber, old, "evLoadURL");
     else if (strcmp(old, "sub") == 0 || strcmp(old, "potmeter") == 0)
-        mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_SkinLegacy, linenumber, old, data);
+        mp_msg(MSGT_GPLAYER, MSGL_INFO, _(MSGTR_GUI_MSG_SkinLegacy), linenumber, old, data);
 }
 
 /**
@@ -100,7 +101,7 @@
     vsnprintf(p, sizeof(p), format, ap);
     va_end(ap);
 
-    gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_GUI_MSG_SkinErrorMessage, linenumber, p);
+    gmp_msg(MSGT_GPLAYER, MSGL_ERR, _(MSGTR_GUI_MSG_SkinErrorMessage), linenumber, p);
 }
 
 /**
@@ -113,7 +114,7 @@
 static int section_item(char *item)
 {
     if (!skin) {
-        skin_error(MSGTR_GUI_MSG_SkinErrorSection, item);
+        skin_error(_(MSGTR_GUI_MSG_SkinErrorSection), item);
         return False;
     }
 
@@ -130,7 +131,7 @@
 static int window_item(char *item)
 {
     if (!currWinName[0]) {
-        skin_error(MSGTR_GUI_MSG_SkinErrorWindow, item);
+        skin_error(_(MSGTR_GUI_MSG_SkinErrorWindow), item);
         return False;
     }
 
@@ -147,7 +148,7 @@
 static int in_window(char *name)
 {
     if (strcmp(currWinName, name) == 0) {
-        skin_error(MSGTR_GUI_MSG_SkinErrorItem, name);
+        skin_error(_(MSGTR_GUI_MSG_SkinErrorItem), name);
         return 1;
     }
 
@@ -167,7 +168,7 @@
         (*currWinItemIdx)++;
         item = &currWinItems[*currWinItemIdx];
     } else
-        skin_error(MSGTR_GUI_MSG_SkinTooManyItems);
+        skin_error(_(MSGTR_GUI_MSG_SkinTooManyItems));
 
     return item;
 }
@@ -184,14 +185,14 @@
 static int item_section(char *in)
 {
     if (skin) {
-        skin_error(MSGTR_GUI_MSG_SkinErrorItem, currItem);
+        skin_error(_(MSGTR_GUI_MSG_SkinErrorItem), currItem);
         return 1;
     }
 
     if (strcmp(strlower(in), "movieplayer") == 0)
         skin = &guiApp;
     else {
-        skin_error(MSGTR_GUI_MSG_SkinUnknownName, in);
+        skin_error(_(MSGTR_GUI_MSG_SkinUnknownName), in);
         return 1;
     }
 
@@ -254,7 +255,7 @@
         return 1;
 
     if (currWinName[0]) {
-        skin_error(MSGTR_GUI_MSG_SkinErrorItem, currItem);
+        skin_error(_(MSGTR_GUI_MSG_SkinErrorItem), currItem);
         return 1;
     }
 
@@ -283,7 +284,7 @@
         currWinItemIdx = &skin->IndexOfMenuItems;
         currWinItems   = skin->menuItems;
     } else {
-        skin_error(MSGTR_GUI_MSG_SkinUnknownName, in);
+        skin_error(_(MSGTR_GUI_MSG_SkinUnknownName), in);
         return 1;
     }
 
@@ -364,7 +365,7 @@
 
     if (!is_video) {
         if (!bpRenderMask(&currWin->Bitmap, &currWin->Mask)) {
-            skin_error(MSGTR_GUI_MSG_SkinMemoryError);
+            skin_error(_(MSGTR_GUI_MSG_SkinMemoryError));
             return 1;
         }
         mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     mask: %ux%u\n", currWin->Mask.Width, currWin->Mask.Height);
@@ -443,7 +444,7 @@
     message = appFindMessage(msg);
 
     if (message == -1) {
-        skin_error(MSGTR_GUI_MSG_SkinUnknownMessage, msg);
+        skin_error(_(MSGTR_GUI_MSG_SkinUnknownMessage), msg);
         return 1;
     }
     // legacy
@@ -562,7 +563,7 @@
     message = appFindMessage(msg);
 
     if (message == -1) {
-        skin_error(MSGTR_GUI_MSG_SkinUnknownMessage, msg);
+        skin_error(_(MSGTR_GUI_MSG_SkinUnknownMessage), msg);
         return 1;
     }
     // legacy
@@ -641,7 +642,7 @@
     message = appFindMessage(buf);
 
     if (message == -1) {
-        skin_error(MSGTR_GUI_MSG_SkinUnknownMessage, buf);
+        skin_error(_(MSGTR_GUI_MSG_SkinUnknownMessage), buf);
         return 1;
     }
     // legacy
@@ -649,7 +650,7 @@
         skin_legacy("evSetURL", buf);
 
     if (d < 0 || d > 100) {
-        skin_error(MSGTR_GUI_MSG_SkinErrorDefault, d);
+        skin_error(_(MSGTR_GUI_MSG_SkinErrorDefault), d);
         return 1;
     }
 
@@ -692,7 +693,7 @@
 
     if (strcmp(phfname, "NULL") != 0) {
         if (num == 0) {
-            skin_error(MSGTR_GUI_MSG_SkinErrorNumphases);
+            skin_error(_(MSGTR_GUI_MSG_SkinErrorNumphases));
             return 1;
         }
 
@@ -848,7 +849,7 @@
     message = appFindMessage(buf);
 
     if (message == -1) {
-        skin_error(MSGTR_GUI_MSG_SkinUnknownMessage, buf);
+        skin_error(_(MSGTR_GUI_MSG_SkinUnknownMessage), buf);
         return 1;
     }
     // legacy
@@ -856,7 +857,7 @@
         skin_legacy("evSetURL", buf);
 
     if (d < 0 || d > 100) {
-        skin_error(MSGTR_GUI_MSG_SkinErrorDefault, d);
+        skin_error(_(MSGTR_GUI_MSG_SkinErrorDefault), d);
         return 1;
     }
 
@@ -882,7 +883,7 @@
 
     if (strcmp(phfname, "NULL") != 0) {
         if (num == 0) {
-            skin_error(MSGTR_GUI_MSG_SkinErrorNumphases);
+            skin_error(_(MSGTR_GUI_MSG_SkinErrorNumphases));
             return 1;
         }
 
@@ -926,19 +927,19 @@
 
     switch (fntRead(path, fnt)) {
     case -1:
-        skin_error(MSGTR_GUI_MSG_SkinMemoryError);
+        skin_error(_(MSGTR_GUI_MSG_SkinMemoryError));
         return 1;
 
     case -2:
-        skin_error(MSGTR_GUI_MSG_SkinTooManyFonts);

MPlayer-1.2.r38170.tar.xz/gui/ui/actions.c -> MPlayer-1.2.r38304.tar.xz/gui/ui/actions.c Changed

MPlayer-1.2.r38170.tar.xz/gui/ui/main.c -> MPlayer-1.2.r38304.tar.xz/gui/ui/main.c Changed

MPlayer-1.2.r38170.tar.xz/gui/ui/menu.c -> MPlayer-1.2.r38304.tar.xz/gui/ui/menu.c Changed

@@ -27,6 +27,7 @@
 #include "mp_msg.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
+#include "gui/interface.h"
 #include "actions.h"
 #include "ui.h"
 #include "gui/util/mem.h"
@@ -34,6 +35,8 @@
 
 #include "gui/dialog/dialog.h"
 
+#include "libavutil/avstring.h"
+
 unsigned char * menuDrawBuffer = NULL;
 static int      uiMenuRender = True;
 int             menuItem = -1;
@@ -108,14 +111,16 @@
 
  if ( ( menuDrawBuffer = calloc( 1,guiApp.menu.Bitmap.ImageSize ) ) == NULL )
   {
-    mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu] " MSGTR_GUI_MSG_MemoryErrorWindow );
-   gtkMessageBox( MSGBOX_FATAL,"[menu] " MSGTR_GUI_MSG_MemoryErrorWindow );
-   return;
+   char msg[80] = "[menu] ";
+
+   av_strlcat( msg, _(MSGTR_GUI_MSG_MemoryErrorWindow), sizeof(msg) );
+   gmp_msg( MSGT_GPLAYER, MSGL_FATAL, msg );
+   mplayer( MPLAYER_EXIT_GUI, EXIT_ERROR, 0 );
   }
 
  wsWindowCreate( &guiApp.menuWindow,
  guiApp.menu.x,guiApp.menu.y,guiApp.menu.width,guiApp.menu.height,
- wsOverredirect|wsHideFrame|wsMaxSize|wsMinSize|wsHideWindow,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,"MPlayer menu" );
+ wsOverredirect|wsHideFrame|wsMaxSize|wsMinSize|wsHideWindow,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,MPlayer" - Menu" );
 
  mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu] menuWindow ID: 0x%x\n",(int)guiApp.menuWindow.WindowID );

MPlayer-1.2.r38170.tar.xz/gui/ui/playbar.c -> MPlayer-1.2.r38304.tar.xz/gui/ui/playbar.c Changed

@@ -47,6 +47,7 @@
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 #include "codec-cfg.h"
+#include "libavutil/avstring.h"
 
 #include "ui.h"
 #include "actions.h"
@@ -286,14 +287,17 @@
 
  if ( ( playbarDrawBuffer = malloc( guiApp.playbar.Bitmap.ImageSize ) ) == NULL )
   {
-   gmp_msg( MSGT_GPLAYER,MSGL_FATAL,"[playbar] " MSGTR_GUI_MSG_MemoryErrorWindow );
+   char msg[80] = "[playbar] ";
+
+   av_strlcat( msg, _(MSGTR_GUI_MSG_MemoryErrorWindow), sizeof(msg) );
+   gmp_msg( MSGT_GPLAYER, MSGL_FATAL, msg );
    mplayer( MPLAYER_EXIT_GUI, EXIT_ERROR, 0 );
   }
 
  guiApp.playbarWindow.Parent=guiApp.videoWindow.WindowID;
  wsWindowCreate( &guiApp.playbarWindow,
    guiApp.playbar.x,guiApp.playbar.y,guiApp.playbar.width,guiApp.playbar.height,
-   wsHideFrame|wsHideWindow,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,"PlayBar" );
+   wsHideFrame|wsHideWindow,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,MPlayer" - PlayBar" );
 
  mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[playbar] playbarWindow ID: 0x%x\n",(int)guiApp.playbarWindow.WindowID );

MPlayer-1.2.r38170.tar.xz/gui/ui/render.c -> MPlayer-1.2.r38304.tar.xz/gui/ui/render.c Changed

@@ -86,7 +86,7 @@
             else if (len > 5 && fname[len - 5] == '.')
                 fname[len - 5] = 0;
         } else
-            av_strlcpy(fname, MSGTR_GUI_MSG_NoFileLoaded, maxlen);
+            av_strlcpy(fname, _(MSGTR_GUI_MSG_NoFileLoaded), maxlen);
 
         break;
 
@@ -97,27 +97,27 @@
 
     case STREAMTYPE_CDDA:
 
-        snprintf(fname, maxlen, MSGTR_GUI_TitleN, guiInfo.Track);
+        snprintf(fname, maxlen, _(MSGTR_GUI_TitleN), guiInfo.Track);
         break;
 
     case STREAMTYPE_VCD:
 
-        snprintf(fname, maxlen, MSGTR_GUI_TitleN, guiInfo.Track - 1);
+        snprintf(fname, maxlen, _(MSGTR_GUI_TitleN), guiInfo.Track - 1);
         break;
 
     case STREAMTYPE_DVD:
 
         if (guiInfo.Chapter)
-            snprintf(fname, maxlen, MSGTR_GUI_ChapterN, guiInfo.Chapter);
+            snprintf(fname, maxlen, _(MSGTR_GUI_ChapterN), guiInfo.Chapter);
         else
-            av_strlcpy(fname, MSGTR_GUI_NoChapter, maxlen);
+            av_strlcpy(fname, _(MSGTR_GUI_NoChapter), maxlen);
 
         break;
 
     case STREAMTYPE_TV:
     case STREAMTYPE_DVB:
 
-        p      = MSGTR_GUI_NoChannelName;
+        p      = _(MSGTR_GUI_NoChannelName);
         stream = mpctx_get_stream(guiInfo.mpcontext);
 
         if (stream)
@@ -129,7 +129,7 @@
     case STREAMTYPE_BINCUE:
 
         if (guiInfo.Track)
-            snprintf(fname, maxlen, MSGTR_GUI_TitleN, guiInfo.Track - guiInfo.Angles);
+            snprintf(fname, maxlen, _(MSGTR_GUI_TitleN), guiInfo.Track - guiInfo.Angles);
         else
             *fname = 0;
 
@@ -137,7 +137,7 @@
 
     default:
 
-        av_strlcpy(fname, MSGTR_GUI_MSG_NoMediaOpened, maxlen);
+        av_strlcpy(fname, _(MSGTR_GUI_MSG_NoMediaOpened), maxlen);
         break;
     }

MPlayer-1.2.r38170.tar.xz/gui/ui/video.c -> MPlayer-1.2.r38304.tar.xz/gui/ui/video.c Changed

MPlayer-1.2.r38170.tar.xz/gui/util/bitmap.c -> MPlayer-1.2.r38304.tar.xz/gui/util/bitmap.c Changed

MPlayer-1.2.r38170.tar.xz/gui/win32/dialogs.c -> MPlayer-1.2.r38304.tar.xz/gui/win32/dialogs.c Changed

MPlayer-1.2.r38170.tar.xz/gui/win32/gui.c -> MPlayer-1.2.r38304.tar.xz/gui/win32/gui.c Changed

MPlayer-1.2.r38170.tar.xz/gui/win32/skinload.c -> MPlayer-1.2.r38304.tar.xz/gui/win32/skinload.c Changed

MPlayer-1.2.r38170.tar.xz/gui/win32/wincfg.c -> MPlayer-1.2.r38304.tar.xz/gui/win32/wincfg.c Changed

MPlayer-1.2.r38170.tar.xz/gui/wm/ws.c -> MPlayer-1.2.r38304.tar.xz/gui/wm/ws.c Changed

@@ -20,10 +20,12 @@
  */
 
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ipc.h>
 #include <X11/Xatom.h>
+#include <X11/Xlibint.h>
 
 #include "ws.h"
 #include "wsxdnd.h"
@@ -36,6 +38,7 @@
 #include "mp_msg.h"
 #include "mpbswap.h"
 #include "mplayer.h"
+#include "libavutil/avstring.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/pixfmt.h"
 #include "libswscale/swscale.h"
@@ -64,6 +67,8 @@
 int wsOrgY;                          // Screen origin y.
 
 Display *wsDisplay;
+XVisualInfo *gui_vinfo;
+
 static int wsScreen;
 static Window wsRootWin;
 
@@ -200,7 +205,7 @@
         mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] display name: %s => %s display.\n", dispname, localdisp ? "local" : "REMOTE");
 
         if (!localdisp)
-            mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_RemoteDisplay);
+            mp_msg(MSGT_GPLAYER, MSGL_INFO, _(MSGTR_GUI_MSG_RemoteDisplay));
     }
 
 #ifdef HAVE_SHM
@@ -209,7 +214,7 @@
     wsUseXShm = False;
 
     if (!wsUseXShm)
-        mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_XSharedMemoryUnavailable);
+        mp_msg(MSGT_GPLAYER, MSGL_INFO, _(MSGTR_GUI_MSG_XSharedMemoryUnavailable));
 
 #ifdef CONFIG_XSHAPE
     if (!XShapeQueryExtension(wsDisplay, &eventbase, &errorbase))
@@ -217,7 +222,7 @@
     wsUseXShape = False;
 
     if (!wsUseXShape)
-        mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_XShapeError);
+        mp_msg(MSGT_GPLAYER, MSGL_WARN, _(MSGTR_GUI_MSG_XShapeError));
 
     wsScreen  = DefaultScreen(wsDisplay);
     wsRootWin = RootWindow(wsDisplay, wsScreen);
@@ -309,12 +314,42 @@
 static int wsErrorHandler(Display *display, XErrorEvent *event)
 {
     char type[128];
+    char msg[80]     = "[ws] ";
+    _XExtension *ext = NULL;
 
     XGetErrorText(display, event->error_code, type, sizeof(type));
 
-    mp_msg(MSGT_GPLAYER, MSGL_ERR, "[ws] " MSGTR_GUI_MSG_X11Error);
+    av_strlcat(msg, _(MSGTR_GUI_MSG_X11Error), sizeof(msg));
+    mp_msg(MSGT_GPLAYER, MSGL_ERR, "%s", msg);
     mp_msg(MSGT_GPLAYER, MSGL_ERR, "[ws]  Error code: %d - %s\n", event->error_code, type);
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws]  Request code: %d (minor code: %d)\n", event->request_code, event->minor_code);
+
+    if (event->request_code < 128) {
+        snprintf(type, sizeof(type), "%d", event->request_code);
+        XGetErrorDatabaseText(display, "XRequest", type, "?", type, sizeof(type));
+    } else {
+        ext = display->ext_procs;
+
+        while (ext && (ext->codes.major_opcode != event->request_code))
+            ext = ext->next;
+
+        if (ext)
+            snprintf(type, sizeof(type), "%s", ext->name);
+        else
+            strcpy(type, "?");
+    }
+
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws]  Request code: %d (%s)\n", event->request_code, type);
+
+    if (event->request_code >= 128) {
+        if (ext) {
+            snprintf(type, sizeof(type), "%s.%d", ext->name, event->minor_code);
+            XGetErrorDatabaseText(display, "XRequest", type, "?", type, sizeof(type));
+        } else
+            strcpy(type, "?");
+
+        mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws]  Minor code: %d (%s)\n", event->minor_code, type);
+    }
+
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws]  MPlayer module: %s\n", current_module ? current_module : "(none)");
 
     return 0;
@@ -791,7 +826,7 @@
             break;
 
     if (i == wsWLCount) {
-        mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_TooManyWindows);
+        mp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MSG_TooManyWindows));
         mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
     }
 
@@ -822,12 +857,14 @@
     depth = vo_find_depth_from_visuals(wsDisplay, wsScreen, NULL);
 
     if (depth < 15) {
-        mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_ColorDepthTooLow);
+        mp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MSG_ColorDepthTooLow));
         mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
     }
 
     XMatchVisualInfo(wsDisplay, wsScreen, depth, TrueColor, &win->VisualInfo);
 
+    gui_vinfo = &win->VisualInfo;
+
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] visual: ID %#lx\n", win->VisualInfo.visualid);
 
 /* --- */
@@ -1316,7 +1353,7 @@
                                       win->VisualInfo.depth, ZPixmap, NULL, &win->Shminfo, w, h);
 
         if (win->xImage == NULL) {
-            mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_XSharedMemoryError);
+            mp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MSG_XSharedMemoryError));
             mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
         }
 
@@ -1324,7 +1361,7 @@
 
         if (win->Shminfo.shmid < 0) {
             XDestroyImage(win->xImage);
-            mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_XSharedMemoryError);
+            mp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MSG_XSharedMemoryError));
             mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
         }
 
@@ -1336,7 +1373,7 @@
             if (win->Shminfo.shmaddr != ((char *)-1))
                 shmdt(win->Shminfo.shmaddr);
 
-            mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_XSharedMemoryError);
+            mp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MSG_XSharedMemoryError));
             mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
         }
 
@@ -1354,7 +1391,7 @@
                                    0);
 
         if ((win->xImage->data = malloc(win->xImage->bytes_per_line * win->xImage->height)) == NULL) {
-            mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_MemoryErrorImage);
+            mp_msg(MSGT_GPLAYER, MSGL_FATAL, _(MSGTR_GUI_MSG_MemoryErrorImage));
             mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
         }
     }

MPlayer-1.2.r38170.tar.xz/gui/wm/wsxdnd.c -> MPlayer-1.2.r38304.tar.xz/gui/wm/wsxdnd.c Changed

@@ -21,6 +21,7 @@
 
 #include <X11/Xlib.h>
 #include "wsxdnd.h"
+#include "gui/app/gui.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -100,7 +101,7 @@
     XSendEvent(wsDisplay, selowner, 0, 0, &xevent);
 
     if (!delme){
-      mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_GUI_MSG_DragAndDropNothing );
+      mp_msg( MSGT_GPLAYER,MSGL_WARN,_(MSGTR_GUI_MSG_DragAndDropNothing) );
       return False;
     }
 
@@ -170,7 +171,7 @@
         }
       }
       if (atom_support == None) {
-        mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_GUI_MSG_NotAFile0 );
+        mp_msg( MSGT_GPLAYER,MSGL_WARN,_(MSGTR_GUI_MSG_NotAFile0) );
       }
     } else {
       /* need to check the whole list here */
@@ -217,7 +218,7 @@
 
   if (event->message_type == XA_XdndDrop) {
     if ((Window) event->data.l[0] != XGetSelectionOwner(wsDisplay, XA_XdndSelection)){
-      mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_GUI_MSG_DragAndDropOwner );
+      mp_msg( MSGT_GPLAYER,MSGL_WARN,_(MSGTR_GUI_MSG_DragAndDropOwner) );
     }
     if (atom_support != None) {
       XConvertSelection(wsDisplay, XA_XdndSelection, atom_support,

MPlayer-1.2.r38170.tar.xz/help/help_check.sh -> MPlayer-1.2.r38304.tar.xz/help/help_check.sh Changed

MPlayer-1.2.r38304.tar.xz/help/help_create_po.pl Added

@@ -0,0 +1,84 @@
+#!/usr/bin/perl
+
+# create a po file from a help file
+#
+# $ARGV[0]: help file
+# $ARGV[1]: po file
+
+my %podefs;
+my %written;
+
+# read a help file
+
+sub read_help
+{
+  my ($file) = @_;
+  my ($lang) = ($file =~ /help\/help_mp-(.*).h/);
+
+  open(help, "< $file") or die "Cannot open $file";
+
+  while (my $line = <help>)
+  {
+    chomp $line;
+
+    if ($line =~ s/\\$//)
+    {
+      $line .= <help>;
+      redo unless eof(help);
+    }
+
+    next if ($line !~ /^\s*#define/);
+
+    my ($msgid, $msgstr) = ($line =~ /^\s*#define\s+(\w+)\s+(".*")/);
+
+    if (!$msgstr)
+    {
+      # defined by an other macro?
+      ($msgid, $msgstr) = ($line =~ /^\s*#define\s+(\w+)\s+(\w+)/);
+
+      next if (!$msgstr);
+
+      $msgstr = $podefs{$msgstr}{$lang};
+    }
+
+    $podefs{$msgid}{$lang} = $msgstr;
+  }
+
+  close(help);
+}
+
+read_help("help/help_mp-en.h");
+read_help($ARGV[0]);
+
+# create po file
+
+my ($lang) = ($ARGV[1] =~ /help\/po\/(.*).po/);
+open(po, "> $ARGV[1]") or die "Cannot open $ARGV[1]";
+
+print po "# DO NOT EDIT - this file is generated from $ARGV[0]\n";
+
+foreach my $id (keys %podefs)
+{
+  # for the moment only X11/GTK GUI strings
+  next if (substr($id, 0, 10) ne "MSGTR_GUI_");
+  next if (substr($id, 0, 15) eq "MSGTR_GUI_WIN32");
+
+  my $msgid = $podefs{$id}{"en"};
+  my $msgstr = $podefs{$id}{$lang} ? $podefs{$id}{$lang} : $msgid;
+
+  # avoid duplicates
+  next if ($written{$msgid}{$msgstr});
+
+  # no translation necessary
+  next if ($msgid eq $msgstr);
+
+  # different translations
+  die "$msgid has already been translated differently\n" if (keys %{$written{$msgid}});
+
+  print po "\nmsgid $msgid\n";
+  print po "msgstr $msgstr\n";
+
+  $written{$msgid}{$msgstr} = 1;
+}
+
+close(po);

MPlayer-1.2.r38170.tar.xz/help/help_mp-bg.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-bg.h Changed

@@ -306,7 +306,7 @@
 #define MSGTR_VideoStreamRequired "Задължително е да има видео поток!\n"
 #define MSGTR_ForcingInputFPS "Входящите кадри в секунда ще се интерпретират като %5.3f\n"
 #define MSGTR_DemuxerDoesntSupportNosound "Tози разпределител все още не поддържа -nosound .\n"
-#define MSGTR_MemAllocFailed "не може да задели памет"
+#define MSGTR_MemAllocFailed "не може да задели памет\n"
 #define MSGTR_NoMatchingFilter "Не може да бъде намерен подходящ филтър/изходен аудио формат!\n"
 #define MSGTR_MP3WaveFormatSizeNot30 "sizeof(MPEGLAYER3WAVEFORMAT)==%d!=30, може би заради C компилатора?\n"
 #define MSGTR_NoLavcAudioCodecName "LAVC аудио, Липсва име на кодек!\n"
@@ -531,6 +531,8 @@
 #define MSGTR_GUI_Cache "Кеширане"
 #define MSGTR_GUI_CacheSize "Размер на кеша"
 #define MSGTR_GUI_Cancel "Отказ"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Централен"
 #define MSGTR_GUI_Channel1 "Канал 1"
 #define MSGTR_GUI_Channel2 "Канал 2"
@@ -546,6 +548,7 @@
 #define MSGTR_GUI_CodecFamilyAudio "Фамилия аудио кодеци"
 #define MSGTR_GUI_CodecFamilyVideo "Фамилия видео кодеци"
 #define MSGTR_GUI_Coefficient "Коефициент"
+#define MSGTR_GUI_ConfigFileError "грешка в конфигурационния файл\n"
 #define MSGTR_GUI_Configure "Конфигурация"
 #define MSGTR_GUI_ConfigureDriver "Конфигуриране на драйвера"
 #define MSGTR_GUI_Contrast "Контраст"
@@ -607,16 +610,17 @@
 #define MSGTR_GUI_Hue "Тон"
 #define MSGTR_GUI_Lavc "Използване на LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Автоматичен контрол на качеството"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Разни"
 #define MSGTR_GUI_Mixer "Смесител"
 #define MSGTR_GUI_MixerChannel "Канал на смесителя"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Добавяне на видео филтър: %s\n"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Твърде ниска дълбочина на цветовете.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Не е върнат резултат!\n"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "За съжаление, не можете да възпроизвеждате различни от MPEG\nфайлове с вашето DXR3/H+ устройство без прекодиране.\nМоля разрешете lavc в полето за конфигурация на DXR3/H+ ."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "За съжаление, не можете да възпроизвеждате различни от MPEG\nфайлове с вашето DXR3/H+ устройство без прекодиране.\nМоля разрешете lavc в полето за конфигурация на DXR3/H+ .\n"
 #define MSGTR_GUI_MSG_LoadingSubtitle "[GUI] Зареждане на субтитрите: %s\n"
 #define MSGTR_GUI_MSG_MemoryErrorImage "Няма достатъчно памет за draw buffer.\n"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "За съжаление, няма достатъчно памет за draw buffer."
+#define MSGTR_GUI_MSG_MemoryErrorWindow "За съжаление, няма достатъчно памет за draw buffer.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Не е зареден файл."
 #define MSGTR_GUI_MSG_NoMediaOpened "Няма отворени елементи."
 #define MSGTR_GUI_MSG_NotAFile0 "Това не прилича на файл...\n"
@@ -641,7 +645,7 @@
 #define MSGTR_GUI_MSG_SkinUnknownParameter "неизвестен параметър (%s)\n"
 #define MSGTR_GUI_MSG_TooManyWindows "Твърде много отворени прозорци.\n"
 #define MSGTR_GUI_MSG_UnableToSaveOption "Не може да се запамети опцията '%s'.\n"
-#define MSGTR_GUI_MSG_VideoOutError "За съжаление, няма съвместим с GUI видео драйвер."
+#define MSGTR_GUI_MSG_VideoOutError "За съжаление, няма съвместим с GUI видео драйвер.\n"
 #define MSGTR_GUI_MSG_XShapeError "За съжаление вашата система не поддържа разширението XShape.\n"
 #define MSGTR_GUI_MSG_XSharedMemoryError "грешка в разширението за споделена памет\n"
 #define MSGTR_GUI_MSG_XSharedMemoryUnavailable "За съжаление вашата система не поддържа разширението на X за споделена памет.\n"

MPlayer-1.2.r38170.tar.xz/help/help_mp-cs.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-cs.h Changed

@@ -513,6 +513,8 @@
 #define MSGTR_GUI_Cache "Vyrovnávací paměť"
 #define MSGTR_GUI_CacheSize "Velikost vyrovnávací paměti"
 #define MSGTR_GUI_Cancel "Zrušit"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Středový"
 #define MSGTR_GUI_Channel1 "Kanál 1"
 #define MSGTR_GUI_Channel2 "Kanál 2"
@@ -529,6 +531,7 @@
 #define MSGTR_GUI_CodecFamilyVideo "Rodina video kodeku"
 #define MSGTR_GUI_CodecsAndLibraries "Kodeky a knihovny třetích stran"
 #define MSGTR_GUI_Coefficient "Koeficient"
+#define MSGTR_GUI_ConfigFileError "chyba konfiguračního souboru\n"
 #define MSGTR_GUI_Configure "Konfigurace"
 #define MSGTR_GUI_ConfigureDriver "Konfigurovat ovladač"
 #define MSGTR_GUI_Contrast "Kontrast"
@@ -594,16 +597,17 @@
 #define MSGTR_GUI_Hue "Odstín"
 #define MSGTR_GUI_Lavc "Použít LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Automatické řízení kvality"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Ostatní"
 #define MSGTR_GUI_Mixer "Mixér"
 #define MSGTR_GUI_MixerChannel "Kanál mixéru"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Přidávám video filtr: %s\n"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Promiňte, ale barevná hloubka je příliš malá.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Nic se nevrátilo!\n"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Bohužel nelze přehrávat ne-MPEG s kartou DXR3/H+ bez přeenkódování.\nProsím, zapněte lavc v konfiguraci DXR3/H+."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Bohužel nelze přehrávat ne-MPEG s kartou DXR3/H+ bez přeenkódování.\nProsím, zapněte lavc v konfiguraci DXR3/H+.\n"
 #define MSGTR_GUI_MSG_LoadingSubtitle "[GUI] Načítám titulky: %s\n"
 #define MSGTR_GUI_MSG_MemoryErrorImage "Promiňte, nedostatek paměti pro vykreslení bufferu.\n"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Bohužel není dostatek paměti pro vykreslovací mezipaměť."
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Bohužel není dostatek paměti pro vykreslovací mezipaměť.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Není načten žádný soubor."
 #define MSGTR_GUI_MSG_NoMediaOpened "Nic není otevřeno."
 #define MSGTR_GUI_MSG_NotAFile0 "Toto nevypadá jako soubor...\n"
@@ -629,7 +633,7 @@
 #define MSGTR_GUI_MSG_SkinUnknownParameter "neznámý parametr (%s)\n"
 #define MSGTR_GUI_MSG_TooManyWindows "Příliš mnoho otevřených oken.\n"
 #define MSGTR_GUI_MSG_UnableToSaveOption "[cfg] Nelze uložit volbu '%s'.\n"
-#define MSGTR_GUI_MSG_VideoOutError "Bohužel nebyl nalezen video ovladač kompatibilní s GUI."
+#define MSGTR_GUI_MSG_VideoOutError "Bohužel nebyl nalezen video ovladač kompatibilní s GUI.\n"
 #define MSGTR_GUI_MSG_XShapeError "Promiňte, ale váš systém nepodporuje rozšíření XShape.\n"
 #define MSGTR_GUI_MSG_XSharedMemoryError "chyba rozšíření shared memory\n"
 #define MSGTR_GUI_MSG_XSharedMemoryUnavailable "Promiňte, ale váš systém nepodporuje rozšíření X shared memory.\n"
@@ -701,6 +705,7 @@
 #define MSGTR_GUI_Video "Obraz"
 #define MSGTR_GUI_VideoEncoder "Video enkodér"
 #define MSGTR_GUI_VideoTracks "Video stopa"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Varování!"
 
 // ======================= video output drivers ========================

MPlayer-1.2.r38170.tar.xz/help/help_mp-da.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-da.h Changed

@@ -332,6 +332,8 @@
 #define MSGTR_GUI_Cache "Cache"
 #define MSGTR_GUI_CacheSize "Cache størrelse"
 #define MSGTR_GUI_Cancel "Annuller"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Center"
 #define MSGTR_GUI_Channel1 "Kanal 1"
 #define MSGTR_GUI_Channel2 "Kanal 2"
@@ -406,8 +408,8 @@
 #define MSGTR_GUI_Lavc "Brug LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Auto kvalitet"
 #define MSGTR_GUI_Miscellaneous "Forskelligt"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "For at afspille ikke-mpeg filer med dit DXR3/H+ skal du kode filmen igen.\nVenligst aktiver lavc i DXR3/H+ configboxen."
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Desværre, ikke nok ram til at vise bufferen."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "For at afspille ikke-mpeg filer med dit DXR3/H+ skal du kode filmen igen.\nVenligst aktiver lavc i DXR3/H+ configboxen.\n"
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Desværre, ikke nok ram til at vise bufferen.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Ingen fil indlæst"
 #define MSGTR_GUI_MSG_NoMediaOpened "Medie ikke åbnet"
 #define MSGTR_GUI_MSG_PlaybackNeedsRestart "Husk, nogle funktioner kræver at MPlayer bliver genstartet for at de virker."
@@ -424,7 +426,7 @@
 #define MSGTR_GUI_MSG_SkinTooManyFonts "for mange skrifttyper specificeret\n"
 #define MSGTR_GUI_MSG_SkinUnknownMessage "ukendt besked: %s\n"
 #define MSGTR_GUI_MSG_SkinUnknownParameter "ukendt parameter (%s)\n"
-#define MSGTR_GUI_MSG_VideoOutError "Desværre, kunne ikke finde GUI kompabitel video driver."
+#define MSGTR_GUI_MSG_VideoOutError "Desværre, kunne ikke finde GUI kompabitel video driver.\n"
 #define MSGTR_GUI_Mute "Mute"
 #define MSGTR_GUI_NetworkStreaming "Netværksstreaming..."
 #define MSGTR_GUI_Next "Næste stream"

MPlayer-1.2.r38170.tar.xz/help/help_mp-de.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-de.h Changed

@@ -81,8 +81,8 @@
 #define MSGTR_NoHomeDir "Kann Homeverzeichnis nicht finden.\n"
 #define MSGTR_GetpathProblem "get_path(\"config\") fehlgeschlagen.\n"
 #define MSGTR_CreatingCfgFile "Erstelle Konfigurationsdatei: %s\n"
-#define MSGTR_CantLoadFont "Bitmap-Schriftdatei '%s' kann nicht geladen werden.\n"
-#define MSGTR_CantLoadSub "Untertitel '%s' können nicht geladen werden.\n"
+#define MSGTR_CantLoadFont "Bitmap-Schriftdatei »%s« kann nicht geladen werden.\n"
+#define MSGTR_CantLoadSub "Untertitel »%s« können nicht geladen werden.\n"
 #define MSGTR_DumpSelectedStreamMissing "dump: FATAL: Ausgewählter Stream fehlt!\n"
 #define MSGTR_CantOpenDumpfile "Kann dump-Datei nicht öffnen!\n"
 #define MSGTR_CoreDumped "Core dumped ;)\n"
@@ -751,6 +751,8 @@
 #define MSGTR_GUI_Cache "Cache"
 #define MSGTR_GUI_CacheSize "Cachegröße"
 #define MSGTR_GUI_Cancel "Abbrechen"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_CD "CD"
 #define MSGTR_GUI_Center "Mitte"
 #define MSGTR_GUI_Channel1 "Kanal 1"
@@ -769,6 +771,7 @@
 #define MSGTR_GUI_Codecs "Codecs"
 #define MSGTR_GUI_CodecsAndLibraries "Codecs und externe Bibliotheken"
 #define MSGTR_GUI_Coefficient "Koeffizient"
+#define MSGTR_GUI_ConfigFileError "Konfigurationsdatei-Fehler\n"
 #define MSGTR_GUI_Configure "Konfigurieren"
 #define MSGTR_GUI_ConfigureDriver "Treiber konfigurieren"
 #define MSGTR_GUI_Contrast "Kontrast"
@@ -900,6 +903,7 @@
 #define MSGTR_GUI_Information "Information"
 #define MSGTR_GUI_Lavc "lavc (MPEG-1-Encodierung in Echtzeit)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Maximale Nutzung freier CPU-Zeit"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Minimize "Minimieren"
 #define MSGTR_GUI_Miscellaneous "Sonstiges"
 #define MSGTR_GUI_Mixer "Mixer"
@@ -916,6 +920,7 @@
 #define MSGTR_GUI_MSG_MemoryErrorWindow "Es ist nicht genug Speicher für das Fenster-Rendering vorhanden.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Keine Datei geladen."
 #define MSGTR_GUI_MSG_NoMediaOpened "Keine Medien geöffnet."
+#define MSGTR_GUI_MSG_NoSkinInstalled "Es ist kein »default«-Skin installiert. Skins erlauben eine komfortable Steuerung und zeigen Informationen während des Abspielens an. Ohne Skin ist nur eine einfache Steuerung über ein Menü verfügbar, das mit einem Klick der rechten Maustaste auf dem Video-Fenster erreichbar ist.\n\nInstallieren Sie einen Skin, wählen einen im Skinbrowser oder tragen »gui_skin=Noskin« in die Konfigurationsdatei ein, wenn Sie auf einen Skin verzichten und diese Meldung vermeiden möchten.\n"
 #define MSGTR_GUI_MSG_NotAFile0 "Dies scheint keine Datei zu sein!\n"
 #define MSGTR_GUI_MSG_NotAFile1 "%s scheint keine Datei zu sein!\n"
 #define MSGTR_GUI_MSG_PlaybackNeedsRestart "Manche Optionen werden erst nach einem Neustart der Wiedergabe wirksam."
@@ -925,32 +930,32 @@
 #define MSGTR_GUI_MSG_SkinBitmapConversionError "24-bpp-zu-32-bpp-Konvertierungsfehler in %s\n"
 #define MSGTR_GUI_MSG_SkinBitmapNotFound "Bitmap %s nicht gefunden.\n"
 #define MSGTR_GUI_MSG_SkinBitmapPngReadError "PNG-Lesefehler in %s\n"
-#define MSGTR_GUI_MSG_SkinCfgError "Verarbeitungsfehler in der Konfigurationsdatei des Skins '%s'\n"
-#define MSGTR_GUI_MSG_SkinCfgNotFound "Skin '%s' nicht gefunden.\n"
-#define MSGTR_GUI_MSG_SkinCfgSelectedNotFound "Gewählter Skin '%s' nicht gefunden, es wird Skin 'default' versucht ...\n"
+#define MSGTR_GUI_MSG_SkinCfgError "Verarbeitungsfehler in der Konfigurationsdatei des Skins »%s«\n"
+#define MSGTR_GUI_MSG_SkinCfgNotFound "Skin »%s« nicht gefunden.\n"
+#define MSGTR_GUI_MSG_SkinCfgSelectedNotFound "Gewählter Skin »%s« nicht gefunden, es wird Skin »default« versucht ...\n"
 #define MSGTR_GUI_MSG_SkinDirNotFound "Kein Skin-Verzeichnis gefunden! Bitte einen Skin installieren."
 #define MSGTR_GUI_MSG_SkinErrorBitmap16Bit "Die Farbtiefe von %s beträgt 16 bpp oder weniger, was nicht unterstützt wird.\n"
 #define MSGTR_GUI_MSG_SkinErrorDefault "Vorgabewert (%d) außerhalb des Wertebereichs\n"
-#define MSGTR_GUI_MSG_SkinErrorItem "Dieses Element wird in '%s' nicht unterstützt.\n"
+#define MSGTR_GUI_MSG_SkinErrorItem "Dieses Element wird in »%s« nicht unterstützt.\n"
 #define MSGTR_GUI_MSG_SkinErrorMessage "Fehler in der Skin-Konfigurationsdatei in Zeile %d: %s"
 #define MSGTR_GUI_MSG_SkinErrorNumphases "Die Anzahl der Phasen darf nicht null sein.\n"
-#define MSGTR_GUI_MSG_SkinErrorSection "Für '%s' wurde kein Abschnitt angegeben.\n"
-#define MSGTR_GUI_MSG_SkinErrorWindow "Für '%s' wurde kein Fenster angegeben.\n"
+#define MSGTR_GUI_MSG_SkinErrorSection "Für »%s« wurde kein Abschnitt angegeben.\n"
+#define MSGTR_GUI_MSG_SkinErrorWindow "Für »%s« wurde kein Fenster angegeben.\n"
 #define MSGTR_GUI_MSG_SkinFileNotFound "Skin-Datei %s nicht gefunden.\n"
 #define MSGTR_GUI_MSG_SkinFileNotReadable "Skin-Datei %s nicht lesbar.\n"
 #define MSGTR_GUI_MSG_SkinFontFileNotFound "Schrift-Beschreibungsdatei nicht gefunden.\n"
 #define MSGTR_GUI_MSG_SkinFontImageNotFound "Schrift-Bilddatei nicht gefunden.\n"
-#define MSGTR_GUI_MSG_SkinFontNotFound "Schrift '%s' nicht gefunden.\n"
-#define MSGTR_GUI_MSG_SkinLegacy "Skin-Konfigurationsdatei in Zeile %d: '%s' ist veraltet, stattdessen sollte '%s' verwendet werden.\n"
+#define MSGTR_GUI_MSG_SkinFontNotFound "Schrift »%s« nicht gefunden.\n"
+#define MSGTR_GUI_MSG_SkinLegacy "Skin-Konfigurationsdatei in Zeile %d: »%s« ist veraltet, stattdessen sollte »%s« verwendet werden.\n"
 #define MSGTR_GUI_MSG_SkinMemoryError "Nicht genug Speicher\n"
 #define MSGTR_GUI_MSG_SkinTooManyFonts "Zu viele Schriften definiert.\n"
 #define MSGTR_GUI_MSG_SkinTooManyItems "Zu viele Elemente definiert.\n"
-#define MSGTR_GUI_MSG_SkinUnknownItem "Unbekanntes Element '%s'\n"
-#define MSGTR_GUI_MSG_SkinUnknownMessage "Unbekannte Nachricht '%s'\n"
-#define MSGTR_GUI_MSG_SkinUnknownName "Unbekannter Name '%s'\n"
-#define MSGTR_GUI_MSG_SkinUnknownParameter "Unbekannter Parameter '%s'\n"
+#define MSGTR_GUI_MSG_SkinUnknownItem "Unbekanntes Element »%s«\n"
+#define MSGTR_GUI_MSG_SkinUnknownMessage "Unbekannte Nachricht »%s«\n"
+#define MSGTR_GUI_MSG_SkinUnknownName "Unbekannter Name »%s«\n"
+#define MSGTR_GUI_MSG_SkinUnknownParameter "Unbekannter Parameter »%s«\n"
 #define MSGTR_GUI_MSG_TooManyWindows "Es wurden zu viele Fenster erzeugt!\n"
-#define MSGTR_GUI_MSG_UnableToSaveOption "Die Option '%s' kann nicht gespeichert werden.\n"
+#define MSGTR_GUI_MSG_UnableToSaveOption "Die Option »%s« kann nicht gespeichert werden.\n"
 #define MSGTR_GUI_MSG_VideoOutError "Es wurde kein Treiber für die Videoausgabe gefunden, der die GUI unterstützt.\n"
 #define MSGTR_GUI_MSG_X11Error "Ein X11-Fehler ist aufgetreten!\n"
 #define MSGTR_GUI_MSG_XShapeError "Dieses System unterstützt die XShape-Erweiterung nicht!\n"
@@ -1049,11 +1054,14 @@
 #define MSGTR_GUI_Video "Video"
 #define MSGTR_GUI_VideoEncoder "Videoencoder"
 #define MSGTR_GUI_VideoTracks "Videospuren"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Warnung"
 
 #define MSGTR_GUI_WIN32_AddFile "Datei hinzufügen"
 #define MSGTR_GUI_WIN32_AddURL "URL hinzufügen"
+#define MSGTR_GUI_WIN32_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_WIN32_Close "Schließen"
+#define MSGTR_GUI_WIN32_ConfigFileError MSGTR_GUI_ConfigFileError
 #define MSGTR_GUI_WIN32_DebugConsole "Debugging-Konsole"
 #define MSGTR_GUI_WIN32_Defaults "Standard"
 #define MSGTR_GUI_WIN32_DirectoryList "Verzeichnisliste"

MPlayer-1.2.r38170.tar.xz/help/help_mp-el.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-el.h Changed

@@ -339,6 +339,8 @@
 #define MSGTR_GUI_Cache "Cache"
 #define MSGTR_GUI_CacheSize "Μέγεθος της cache"
 #define MSGTR_GUI_Cancel "Άκυρο"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Κέντρο"
 #define MSGTR_GUI_Channel1 "Κανάλι 1"
 #define MSGTR_GUI_Channel2 "Κανάλι 2"
@@ -413,8 +415,8 @@
 #define MSGTR_GUI_Lavc "Χρήση του LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Αυτόματη ποιότητα"
 #define MSGTR_GUI_Miscellaneous "Διάφορα"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Λυπάμαι, δεν μπορείτε να αναπαράγετε αρχεία που δεν είναι mpeg με τη συσκευή DXR3/H+ χωρίς επανακωδικοποίηση.\n Παρακαλώ ενεργοποιήστε lavc στο DXR3/H+ κουτί-διαλόγου."
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Λυπάμαι, δεν υπάρχει αρκετή μνήμη για εγγραφή  στον buffer."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Λυπάμαι, δεν μπορείτε να αναπαράγετε αρχεία που δεν είναι mpeg με τη συσκευή DXR3/H+ χωρίς επανακωδικοποίηση.\n Παρακαλώ ενεργοποιήστε lavc στο DXR3/H+ κουτί-διαλόγου.\n"
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Λυπάμαι, δεν υπάρχει αρκετή μνήμη για εγγραφή  στον buffer.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "δεν φορτώθηκε αρχείο"
 #define MSGTR_GUI_MSG_NoMediaOpened "Δεν φορτώθηκαν αρχεία"
 #define MSGTR_GUI_MSG_PlaybackNeedsRestart "Προσοχή, μερικές λειτουργίες χρειάζονται επανεκκίνιση αναπαραγωγής."
@@ -431,7 +433,7 @@
 #define MSGTR_GUI_MSG_SkinTooManyFonts "πολλαπλές ορισμένες γραμματοσειρές\n"
 #define MSGTR_GUI_MSG_SkinUnknownMessage "μη αναγνωρίσιμο μήνυμα: %s\n"
 #define MSGTR_GUI_MSG_SkinUnknownParameter "μη αναγνωρίσιμη παράμετρος (%s)\n"
-#define MSGTR_GUI_MSG_VideoOutError "Λυπάμαι, δεν βρέθηκε οδηγός εξόδου βίντεο που να είναι συμβατός με το GUI."
+#define MSGTR_GUI_MSG_VideoOutError "Λυπάμαι, δεν βρέθηκε οδηγός εξόδου βίντεο που να είναι συμβατός με το GUI.\n"
 #define MSGTR_GUI_Mute "Απενεργοποίηση ήχου"
 #define MSGTR_GUI_NetworkStreaming "Streaming δικτύου."
 #define MSGTR_GUI_Next "Επόμενο κανάλι"

MPlayer-1.2.r38170.tar.xz/help/help_mp-en.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-en.h Changed

@@ -1,4 +1,4 @@
-// $Revision: 38113 $
+// $Revision: 38290 $
 // MASTER FILE. Use this file as base for translations.
 // Translated files should be sent to the mplayer-DOCS mailing list or
 // to the help messages maintainer, see DOCS/tech/MAINTAINERS.
@@ -542,6 +542,8 @@
 #define MSGTR_GUI_Cache "Cache"
 #define MSGTR_GUI_CacheSize "Cache size"
 #define MSGTR_GUI_Cancel "Cancel"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_CD "CD"
 #define MSGTR_GUI_Center "Center"
 #define MSGTR_GUI_Channel1 "Channel 1"
@@ -560,6 +562,7 @@
 #define MSGTR_GUI_Codecs "Codecs"
 #define MSGTR_GUI_CodecsAndLibraries "Codecs and third party libraries"
 #define MSGTR_GUI_Coefficient "Coefficient"
+#define MSGTR_GUI_ConfigFileError "Config file error\n"
 #define MSGTR_GUI_Configure "Configure"
 #define MSGTR_GUI_ConfigureDriver "Configure driver"
 #define MSGTR_GUI_Contrast "Contrast"
@@ -691,6 +694,7 @@
 #define MSGTR_GUI_Information "Information"
 #define MSGTR_GUI_Lavc "lavc (realtime mpeg1 encoding)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Maximum usage of spare CPU time"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Minimize "Minimize"
 #define MSGTR_GUI_Miscellaneous "Misc"
 #define MSGTR_GUI_Mixer "Mixer"
@@ -707,6 +711,7 @@
 #define MSGTR_GUI_MSG_MemoryErrorWindow "Not enough memory for window rendering.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "No file loaded."
 #define MSGTR_GUI_MSG_NoMediaOpened "No media opened."
+#define MSGTR_GUI_MSG_NoSkinInstalled "There is no 'default'-skin installed. Skins allow comfortable control and display information during playback. Without a skin, only simple control is available from a menu accessible with a right mouse button click on the video window.\n\nInstall a skin, select one from the skin browser or put 'gui_skin=Noskin' into the configuration file if you want to go without a skin and avoid this message.\n"
 #define MSGTR_GUI_MSG_NotAFile0 "This does not seem to be a file!\n"
 #define MSGTR_GUI_MSG_NotAFile1 "%s does not seem to be a file!\n"
 #define MSGTR_GUI_MSG_PlaybackNeedsRestart "You need to restart playback for some options to take effect."
@@ -840,11 +845,14 @@
 #define MSGTR_GUI_Video "Video"
 #define MSGTR_GUI_VideoEncoder "Video encoder"
 #define MSGTR_GUI_VideoTracks "Video tracks"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Warning"
 
 #define MSGTR_GUI_WIN32_AddFile "Add file"
 #define MSGTR_GUI_WIN32_AddURL "Add URL"
+#define MSGTR_GUI_WIN32_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_WIN32_Close "Close"
+#define MSGTR_GUI_WIN32_ConfigFileError MSGTR_GUI_ConfigFileError
 #define MSGTR_GUI_WIN32_DebugConsole "Debug Console"
 #define MSGTR_GUI_WIN32_Defaults "Defaults"
 #define MSGTR_GUI_WIN32_DirectoryList "Directory list"

MPlayer-1.2.r38170.tar.xz/help/help_mp-es.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-es.h Changed

@@ -545,6 +545,8 @@
 #define MSGTR_GUI_Cache "Cache"
 #define MSGTR_GUI_CacheSize "Tamaño de Cache"
 #define MSGTR_GUI_Cancel "Cancelar"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Centro"
 #define MSGTR_GUI_Channel1 "Canal 1"
 #define MSGTR_GUI_Channel2 "Canal 2"
@@ -561,6 +563,7 @@
 #define MSGTR_GUI_CodecFamilyVideo "Familia de codec de video"
 #define MSGTR_GUI_CodecsAndLibraries "Codecs y librerías de terceros"
 #define MSGTR_GUI_Coefficient "Coeficiente"
+#define MSGTR_GUI_ConfigFileError "error en fichero de configuración\n"
 #define MSGTR_GUI_Configure "Configurar"
 #define MSGTR_GUI_ConfigureDriver "Configurar driver"
 #define MSGTR_GUI_Contrast "Contraste"
@@ -626,16 +629,17 @@
 #define MSGTR_GUI_Hue "Hue"
 #define MSGTR_GUI_Lavc "Usar LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Calidad automática"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Misc"
 #define MSGTR_GUI_Mixer "Mezclador"
 #define MSGTR_GUI_MixerChannel "Canal del Mezclador"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Agregando filtro de video: %s\n"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Lo lamento, la profundidad de color es demasiado baja.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: ¡No retorno nada!\n"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "No puede reproducir archivos no MPEG con su DXR3/H+ sin recodificación. Activa lavc en la configuración del DXR3/H+."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "No puede reproducir archivos no MPEG con su DXR3/H+ sin recodificación. Activa lavc en la configuración del DXR3/H+.\n"
 #define MSGTR_GUI_MSG_LoadingSubtitle "[GUI] Carganado subtítulos: %s\n"
 #define MSGTR_GUI_MSG_MemoryErrorImage "Lo lamento, no hay suficiente memoria para el buffer de dibujo.\n"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "No hay suficiente memoria para dibujar el búfer."
+#define MSGTR_GUI_MSG_MemoryErrorWindow "No hay suficiente memoria para dibujar el búfer.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "no se ha cargado ningún archivo"
 #define MSGTR_GUI_MSG_NoMediaOpened "no se abrió audio/video"
 #define MSGTR_GUI_MSG_NotAFile0 "Esto no parece ser un archivo...\n"
@@ -661,7 +665,7 @@
 #define MSGTR_GUI_MSG_SkinUnknownParameter "parámetro desconocido (%s)\n"
 #define MSGTR_GUI_MSG_TooManyWindows "Hay demasiadas ventanas abiertas.\n"
 #define MSGTR_GUI_MSG_UnableToSaveOption "[cfg] No se puede guardar la opción '%s'.\n"
-#define MSGTR_GUI_MSG_VideoOutError "No se encuentra driver -vo compatible con la interfaz gráfica."
+#define MSGTR_GUI_MSG_VideoOutError "No se encuentra driver -vo compatible con la interfaz gráfica.\n"
 #define MSGTR_GUI_MSG_XShapeError "Lo lamento, su sistema no soporta la extensión XShape.\n"
 #define MSGTR_GUI_MSG_XSharedMemoryError "Error en la extensión de memoria compartida\n"
 #define MSGTR_GUI_MSG_XSharedMemoryUnavailable "Lo lamento, su sistema no soporta la extensión de memoria compartida X.\n"
@@ -733,6 +737,7 @@
 #define MSGTR_GUI_Video "Video"
 #define MSGTR_GUI_VideoEncoder "Codificador de video"
 #define MSGTR_GUI_VideoTracks "Pista de Video"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Advertencia"
 
 // ======================= video output drivers ========================

MPlayer-1.2.r38170.tar.xz/help/help_mp-fr.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-fr.h Changed

@@ -668,6 +668,8 @@
 #define MSGTR_GUI_Cache "Cache"
 #define MSGTR_GUI_CacheSize "Taille du cache "
 #define MSGTR_GUI_Cancel "Annuler"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Centre"
 #define MSGTR_GUI_Channel1 "Canal 1 "
 #define MSGTR_GUI_Channel2 "Canal 2 "
@@ -684,6 +686,7 @@
 #define MSGTR_GUI_CodecFamilyVideo "Famille de codecs vidéo "
 #define MSGTR_GUI_CodecsAndLibraries "Codecs et libraries tiers"
 #define MSGTR_GUI_Coefficient "Coefficient "
+#define MSGTR_GUI_ConfigFileError "Erreur du fichier de configuration\n"
 #define MSGTR_GUI_Configure "Configurer"
 #define MSGTR_GUI_ConfigureDriver "Configuration du pilote"
 #define MSGTR_GUI_Contrast "Contraste "
@@ -749,16 +752,17 @@
 #define MSGTR_GUI_Hue "Tonalité "
 #define MSGTR_GUI_Lavc "Utiliser LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Qualité auto. "
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Divers"
 #define MSGTR_GUI_Mixer "Mixeur "
 #define MSGTR_GUI_MixerChannel "Canal de mixeur "
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Ajout de filtre vidéo : %s\n"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Désolé, la profondeur d'échantillonnage est trop basse.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D : Rien de retourné !\n"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Désolé, vous ne pouvez pas lire de fichiers non-MPEG avec le périphérique DXR3/H+ sans réencoder.\nActivez plutôt lavc dans la boîte de configuration DXR3/H+."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Désolé, vous ne pouvez pas lire de fichiers non-MPEG avec le périphérique DXR3/H+ sans réencoder.\nActivez plutôt lavc dans la boîte de configuration DXR3/H+.\n"
 #define MSGTR_GUI_MSG_LoadingSubtitle "[GUI] Chargement des soustitres : %s\n"
 #define MSGTR_GUI_MSG_MemoryErrorImage "Désolé, mémoire insuffisante pour tampon de dessin.\n"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Désolé, pas assez de mémoire pour le tampon de dessin."
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Désolé, pas assez de mémoire pour le tampon de dessin.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Aucun fichier chargé"
 #define MSGTR_GUI_MSG_NoMediaOpened "Aucun média ouvert"
 #define MSGTR_GUI_MSG_NotAFile0 "Ceci ne semble pas être un fichier...\n"
@@ -784,7 +788,7 @@
 #define MSGTR_GUI_MSG_SkinUnknownParameter "paramètre inconnu (%s)\n"
 #define MSGTR_GUI_MSG_TooManyWindows "Trop de fenêtres ouvertes.\n"
 #define MSGTR_GUI_MSG_UnableToSaveOption "[cfg] Impossible de sauvegarder l'option '%s'.\n"
-#define MSGTR_GUI_MSG_VideoOutError "Désolé, aucun pilote de sortie vidéo compatible avec la GUI."
+#define MSGTR_GUI_MSG_VideoOutError "Désolé, aucun pilote de sortie vidéo compatible avec la GUI.\n"
 #define MSGTR_GUI_MSG_XShapeError "Désolé, votre système ne supporte pas l'extension XShape.\n"
 #define MSGTR_GUI_MSG_XSharedMemoryError "Erreur d'extension de mémoire partagée\n"
 #define MSGTR_GUI_MSG_XSharedMemoryUnavailable "Désolé, votre système ne supporte pas l'extension de mémoire partagée X.\n"
@@ -856,6 +860,7 @@
 #define MSGTR_GUI_Video "Vidéo"
 #define MSGTR_GUI_VideoEncoder "Encodeur vidéo "
 #define MSGTR_GUI_VideoTracks "Piste Vidéo"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Attention !"
 
 // ======================= VO Pilotes Sortie Video ========================

MPlayer-1.2.r38170.tar.xz/help/help_mp-hu.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-hu.h Changed

@@ -526,6 +526,8 @@
 #define MSGTR_GUI_Cache "Gyorsítótár"
 #define MSGTR_GUI_CacheSize "Gyorsítótár merete"
 #define MSGTR_GUI_Cancel "Mégse"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Középső"
 #define MSGTR_GUI_Channel1 "1. Csatorna"
 #define MSGTR_GUI_Channel2 "2. Csatorna"
@@ -542,6 +544,7 @@
 #define MSGTR_GUI_CodecFamilyVideo "Video kodek család"
 #define MSGTR_GUI_CodecsAndLibraries "Codec-ek és third party könyvtárak"
 #define MSGTR_GUI_Coefficient "Együttható"
+#define MSGTR_GUI_ConfigFileError "konfigurációs fájl hibája\n"
 #define MSGTR_GUI_Configure "Beállítás"
 #define MSGTR_GUI_ConfigureDriver "Vezérlő beállítása"
 #define MSGTR_GUI_Contrast "Kontraszt"
@@ -607,16 +610,17 @@
 #define MSGTR_GUI_Hue "Szinárnyalat"
 #define MSGTR_GUI_Lavc "LAVC használata (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Autómatikus minőség állítás"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Egyéb"
 #define MSGTR_GUI_Mixer "Mixer"
 #define MSGTR_GUI_MixerChannel "Mixer csatorna"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Videó szűrő hozzáadása: %s\n"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Bocs, a szín mélység túl kicsi.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Semmi sem jött vissza!\n"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Nem MPEG fájl lejátszása nem lehetséges a DXR3/H+ hardverrel újrakódolás nélkül.\nKapcsold be a lavc opciót a DXR3/H+ konfigurációs panelen."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Nem MPEG fájl lejátszása nem lehetséges a DXR3/H+ hardverrel újrakódolás nélkül.\nKapcsold be a lavc opciót a DXR3/H+ konfigurációs panelen.\n"
 #define MSGTR_GUI_MSG_LoadingSubtitle "[GUI] Feliratok betöltése: %s\n"
 #define MSGTR_GUI_MSG_MemoryErrorImage "Bocs, nincs elég memória a rajz buffernek.\n"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Nincs elég memória a rajzoló bufferhez."
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Nincs elég memória a rajzoló bufferhez.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "nincs fájl betöltve"
 #define MSGTR_GUI_MSG_NoMediaOpened "nincs megnyitva semmi"
 #define MSGTR_GUI_MSG_NotAFile0 "Úgy tűnik, hogy ez nem fájl...\n"
@@ -642,7 +646,7 @@
 #define MSGTR_GUI_MSG_SkinUnknownParameter "ismeretlen paraméter (%s)\n"
 #define MSGTR_GUI_MSG_TooManyWindows "Túl sok nyitott ablak van.\n"
 #define MSGTR_GUI_MSG_UnableToSaveOption "[cfg] A(z) '%s' opciót nem sikerült elmenteni.\n"
-#define MSGTR_GUI_MSG_VideoOutError "Nem találtam GUI-kompatibilis videó meghajtót."
+#define MSGTR_GUI_MSG_VideoOutError "Nem találtam GUI-kompatibilis videó meghajtót.\n"
 #define MSGTR_GUI_MSG_XShapeError "Bocs, a rendszered nem támogatja az XShape kiterjesztést.\n"
 #define MSGTR_GUI_MSG_XSharedMemoryError "osztott memória kiterjesztés hibája\n"
 #define MSGTR_GUI_MSG_XSharedMemoryUnavailable "Bocs, a rendszered nem támogatja az X osztott memória kiterjesztést.\n"
@@ -714,6 +718,7 @@
 #define MSGTR_GUI_Video "Videó"
 #define MSGTR_GUI_VideoEncoder "Video kódoló"
 #define MSGTR_GUI_VideoTracks "Video track"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Figyelmeztetés!"
 
 // ======================= video output drivers ========================

MPlayer-1.2.r38170.tar.xz/help/help_mp-it.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-it.h Changed

@@ -526,6 +526,8 @@
 #define MSGTR_GUI_Cache "Cache"
 #define MSGTR_GUI_CacheSize "Dimensione cache"
 #define MSGTR_GUI_Cancel "Annulla"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Centro"
 #define MSGTR_GUI_Channel1 "Canale 1"
 #define MSGTR_GUI_Channel2 "Canale 2"
@@ -542,6 +544,7 @@
 #define MSGTR_GUI_CodecFamilyVideo "Famiglia codec video"
 #define MSGTR_GUI_CodecsAndLibraries "Codec e librerie di terze parti"
 #define MSGTR_GUI_Coefficient "Coefficiente"
+#define MSGTR_GUI_ConfigFileError "errore file di configurazione\n"
 #define MSGTR_GUI_Configure "Configura"
 #define MSGTR_GUI_ConfigureDriver "Configura driver"
 #define MSGTR_GUI_Contrast "Contrasto"
@@ -607,16 +610,17 @@
 #define MSGTR_GUI_Hue "Tonalità"
 #define MSGTR_GUI_Lavc "Usa LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Qualità automatica"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Varie"
 #define MSGTR_GUI_Mixer "Mixer"
 #define MSGTR_GUI_MixerChannel "Canale mixer"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Aggiungo filtro video: %s\n"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Spiacente, la profondità colore è troppo bassa.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Nessun valore di ritorno!\n"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Mi dispiace, non puoi riprodurre file non-MPEG con il tuo dispositivo DXR3/H+\nsenza ricodificarli.\nAbilita lavc nella finestra di configurazione DXR3/H+."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Mi dispiace, non puoi riprodurre file non-MPEG con il tuo dispositivo DXR3/H+\nsenza ricodificarli.\nAbilita lavc nella finestra di configurazione DXR3/H+.\n"
 #define MSGTR_GUI_MSG_LoadingSubtitle "[GUI] Carico sottotitoli: %s\n"
 #define MSGTR_GUI_MSG_MemoryErrorImage "Spiacente, non abbastanza memoria per il tracciare il buffer.\n"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Mi dispiace, non c'è abbastanza memoria per tracciare il buffer."
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Mi dispiace, non c'è abbastanza memoria per tracciare il buffer.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "nessun file caricato"
 #define MSGTR_GUI_MSG_NoMediaOpened "nessun media aperto"
 #define MSGTR_GUI_MSG_NotAFile0 "Questo non sembra essere un file...\n"
@@ -642,7 +646,7 @@
 #define MSGTR_GUI_MSG_SkinUnknownParameter "parametro sconosciuto  (%s)\n"
 #define MSGTR_GUI_MSG_TooManyWindows "Ci sono troppe finestre aperte.\n"
 #define MSGTR_GUI_MSG_UnableToSaveOption "[cfg] non riesco a salvare l'opzione '%s'.\n"
-#define MSGTR_GUI_MSG_VideoOutError "Mi dispiace, non ho trovato un driver di output video compatibile con la GUI."
+#define MSGTR_GUI_MSG_VideoOutError "Mi dispiace, non ho trovato un driver di output video compatibile con la GUI.\n"
 #define MSGTR_GUI_MSG_XShapeError "Spiacente, il tuo sistema non supporta l'estensione XShape.\n"
 #define MSGTR_GUI_MSG_XSharedMemoryError "errore estensione 'shared memory'\n"
 #define MSGTR_GUI_MSG_XSharedMemoryUnavailable "Spiacente, il tuo sistema non supporta l'estensione 'X shared memory'.\n"
@@ -714,6 +718,7 @@
 #define MSGTR_GUI_Video "Video"
 #define MSGTR_GUI_VideoEncoder "Video encoder"
 #define MSGTR_GUI_VideoTracks "Traccia video"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Avvertimento!"
 
 // ======================= video output drivers ========================

MPlayer-1.2.r38170.tar.xz/help/help_mp-ja.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-ja.h Changed

MPlayer-1.2.r38170.tar.xz/help/help_mp-ko.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-ko.h Changed

@@ -335,6 +335,8 @@
 #define MSGTR_GUI_Cache "캐시"
 #define MSGTR_GUI_CacheSize "캐시 크기"
 #define MSGTR_GUI_Cancel "취소"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "가운데"
 #define MSGTR_GUI_Channel1 "채널 1"
 #define MSGTR_GUI_Channel2 "채널 2"
@@ -409,7 +411,7 @@
 #define MSGTR_GUI_Lavc "LAVC 사용 (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "자동 품질조정"
 #define MSGTR_GUI_Miscellaneous "기타"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "죄송합니다. 그리기 버퍼를 위한 충분한 메모리가 없습니다."
+#define MSGTR_GUI_MSG_MemoryErrorWindow "죄송합니다. 그리기 버퍼를 위한 충분한 메모리가 없습니다.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "파일 없음"
 #define MSGTR_GUI_MSG_NoMediaOpened "미디어 없음"
 #define MSGTR_GUI_MSG_PlaybackNeedsRestart "선택사항들을 적용하려면 재생기를 다시 시작해야 합니다!"
@@ -426,7 +428,7 @@
 #define MSGTR_GUI_MSG_SkinTooManyFonts "폰트가 너무 많이 선언되어 있습니다.\n"
 #define MSGTR_GUI_MSG_SkinUnknownMessage "알 수 없는 메세지입니다.: %s\n"
 #define MSGTR_GUI_MSG_SkinUnknownParameter "알 수 없는 매개변수입니다. (%s)\n"
-#define MSGTR_GUI_MSG_VideoOutError "죄송합니다. GUI 호환 비디오 출력 드라이버를 찾지 못했습니다."
+#define MSGTR_GUI_MSG_VideoOutError "죄송합니다. GUI 호환 비디오 출력 드라이버를 찾지 못했습니다.\n"
 #define MSGTR_GUI_Mute "음소거"
 #define MSGTR_GUI_NetworkStreaming "네트워크 스트리밍..."
 #define MSGTR_GUI_Next "다음"

MPlayer-1.2.r38170.tar.xz/help/help_mp-mk.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-mk.h Changed

@@ -332,6 +332,8 @@
 #define MSGTR_GUI_Cache "Кеш"
 #define MSGTR_GUI_CacheSize "Големина на кешот"
 #define MSGTR_GUI_Cancel "Откажи"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Центар"
 #define MSGTR_GUI_Channel1 "Канал 1"
 #define MSGTR_GUI_Channel2 "Канал 2"
@@ -406,8 +408,8 @@
 #define MSGTR_GUI_Lavc "Користи LAVC (ffmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Авто квалитет"
 #define MSGTR_GUI_Miscellaneous "Разно"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Се извинуваме, не можете да пуштате датотеки кои што не се MPEG со вашиот DXR3/H+ уред без реенкодирање.\nВе молиме овозможете lavc во DXR3/H+ кутијата за конфигурирање."
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Се извинуваме, немате доволно меморија за графичкиот бафер."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Се извинуваме, не можете да пуштате датотеки кои што не се MPEG со вашиот DXR3/H+ уред без реенкодирање.\nВе молиме овозможете lavc во DXR3/H+ кутијата за конфигурирање.\n"
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Се извинуваме, немате доволно меморија за графичкиот бафер.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Не е вчитана датотека."
 #define MSGTR_GUI_MSG_NoMediaOpened "Не е отворен медиум."
 #define MSGTR_GUI_MSG_PlaybackNeedsRestart "Ве молиме запомтете дека треба да го рестартирате плејбекот за да можат некои опции да проработат!"
@@ -424,7 +426,7 @@
 #define MSGTR_GUI_MSG_SkinTooManyFonts "премногу означени фонтови\n"
 #define MSGTR_GUI_MSG_SkinUnknownMessage "непозната порака: %s\n"
 #define MSGTR_GUI_MSG_SkinUnknownParameter "непознат параметар ( %s )\n"
-#define MSGTR_GUI_MSG_VideoOutError "Се извинуваме, не е пронајден компитабилен драјвер на излезното видео за графички интерфејс."
+#define MSGTR_GUI_MSG_VideoOutError "Се извинуваме, не е пронајден компитабилен драјвер на излезното видео за графички интерфејс.\n"
 #define MSGTR_GUI_Mute "Мутирај"
 #define MSGTR_GUI_NetworkStreaming "Мрежен проток ..."
 #define MSGTR_GUI_Next "Нареден стрим"

MPlayer-1.2.r38170.tar.xz/help/help_mp-nb.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-nb.h Changed

MPlayer-1.2.r38170.tar.xz/help/help_mp-nl.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-nl.h Changed

@@ -293,7 +293,7 @@
 #define MSGTR_VideoStreamRequired "Een Video stream is verplicht!\n"
 #define MSGTR_ForcingInputFPS "input fps zal geinterpreteerd worden als %5.3f \n"
 #define MSGTR_DemuxerDoesntSupportNosound "Deze demuxer ondersteunt -nosound nog niet.\n"
-#define MSGTR_MemAllocFailed "geheugentoewijzing gefaald"
+#define MSGTR_MemAllocFailed "geheugentoewijzing gefaald\n"
 #define MSGTR_NoMatchingFilter "Kon geen geldig(e) filter/ao formaat vinden!\n"
 #define MSGTR_MP3WaveFormatSizeNot30 "sizeof(MPEGLAYER3WAVEFORMAT)==%d!=30, Problemen met de C compiler?\n"
 #define MSGTR_NoLavcAudioCodecName "Audio LAVC, ontbrekende codec naam !\n"
@@ -515,6 +515,8 @@
 #define MSGTR_GUI_Cache "Cache"
 #define MSGTR_GUI_CacheSize "Cache grootte"
 #define MSGTR_GUI_Cancel "Annuleer"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Centrum"
 #define MSGTR_GUI_Channel1 "Kanaal 1"
 #define MSGTR_GUI_Channel2 "Kanaal 2"
@@ -530,6 +532,7 @@
 #define MSGTR_GUI_CodecFamilyAudio "Audio codec familie"
 #define MSGTR_GUI_CodecFamilyVideo "Video codec familie"
 #define MSGTR_GUI_Coefficient "Coefficient"
+#define MSGTR_GUI_ConfigFileError "Fout in het configuratie bestand of configuratie bestand ontbreekt\n"
 #define MSGTR_GUI_Configure "Configureer"
 #define MSGTR_GUI_ConfigureDriver "Configureer driver"
 #define MSGTR_GUI_Contrast "Contrast"
@@ -590,11 +593,12 @@
 #define MSGTR_GUI_Hue "Hue"
 #define MSGTR_GUI_Lavc "Gebruik LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Auto kwaliteit"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Misc"
 #define MSGTR_GUI_Mixer "Mixer"
 #define MSGTR_GUI_MixerChannel "Mixer kanaal"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Sorry, je kan geen niet-MPEG bestanden met je DXR3/H+ apparaat aspelen zonder het bestand te herencoderen.\nActiveer lavc in het DXR3/H+ configuratiescherm."
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Sorry, niet genoeg geheugen voor tekenbuffer."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Sorry, je kan geen niet-MPEG bestanden met je DXR3/H+ apparaat aspelen zonder het bestand te herencoderen.\nActiveer lavc in het DXR3/H+ configuratiescherm.\n"
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Sorry, niet genoeg geheugen voor tekenbuffer.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "geen bestand geladen"
 #define MSGTR_GUI_MSG_NoMediaOpened "geen mediabestand geopend"
 #define MSGTR_GUI_MSG_PlaybackNeedsRestart "Denk eraan, dat sommige functies het afspelen herstarten."
@@ -611,7 +615,7 @@
 #define MSGTR_GUI_MSG_SkinTooManyFonts "te veel fonts gedeclareerd\n"
 #define MSGTR_GUI_MSG_SkinUnknownMessage "onbekende boodschap: %s\n"
 #define MSGTR_GUI_MSG_SkinUnknownParameter "onbekende parameter (%s)\n"
-#define MSGTR_GUI_MSG_VideoOutError "Sorry, kon geen GUI compatibele video uitvoer driver vinden."
+#define MSGTR_GUI_MSG_VideoOutError "Sorry, kon geen GUI compatibele video uitvoer driver vinden.\n"
 #define MSGTR_GUI_Mute "Mute"
 #define MSGTR_GUI_NetworkStreaming "Netwerk streaming..."
 #define MSGTR_GUI_Next "Volgende stream"

MPlayer-1.2.r38170.tar.xz/help/help_mp-pl.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-pl.h Changed

@@ -632,6 +632,8 @@
 #define MSGTR_GUI_Cache "Pamięć podręczna"
 #define MSGTR_GUI_CacheSize "Wielkość pamięci podręcznej"
 #define MSGTR_GUI_Cancel "Anuluj"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Centralny"
 #define MSGTR_GUI_Channel1 "Kanał 1"
 #define MSGTR_GUI_Channel2 "Kanał 2"
@@ -648,6 +650,7 @@
 #define MSGTR_GUI_CodecFamilyVideo "Rodzina kodeków video"
 #define MSGTR_GUI_CodecsAndLibraries "Kodeki i inne obce biblioteki"
 #define MSGTR_GUI_Coefficient "Współczynnik"
+#define MSGTR_GUI_ConfigFileError "błąd pliku konfiguracyjnego\n"
 #define MSGTR_GUI_Configure "Konfiguracja"
 #define MSGTR_GUI_ConfigureDriver "Skonfiguruj sterownik"
 #define MSGTR_GUI_Contrast "Kontrast"
@@ -712,16 +715,17 @@
 #define MSGTR_GUI_Hue "Barwa"
 #define MSGTR_GUI_Lavc "Użyj LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Jakość automatyczna"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Inne"
 #define MSGTR_GUI_Mixer "Mixer"
 #define MSGTR_GUI_MixerChannel "Kanał Mixera"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Dodaję filtr video: %s\n"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Niestety paleta kolorów jest za mała.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Nic nie zwrócono!\n"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Niestety, nie można odtwarzać plików innych niż MPEG przy użyciu urządzenia DXR3/H+ bez kowersji.\nProszę włączyć lavc w polu sterowania DXR3/H+."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Niestety, nie można odtwarzać plików innych niż MPEG przy użyciu urządzenia DXR3/H+ bez kowersji.\nProszę włączyć lavc w polu sterowania DXR3/H+.\n"
 #define MSGTR_GUI_MSG_LoadingSubtitle "[GUI] Wczytuję napisy: %s\n"
 #define MSGTR_GUI_MSG_MemoryErrorImage "Za mało pamięci do wyrysowania bufora.\n"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Za mało pamięci by wyrysować bufor."
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Za mało pamięci by wyrysować bufor.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Nie wczytano pliku."
 #define MSGTR_GUI_MSG_NoMediaOpened "Nie otwarto żadnego nośnika."
 #define MSGTR_GUI_MSG_NotAFile0 "To nie wygląda jak plik...\n"
@@ -747,7 +751,7 @@
 #define MSGTR_GUI_MSG_SkinUnknownParameter "nieznany parametr (%s)\n"
 #define MSGTR_GUI_MSG_TooManyWindows "Za dużo otwartych okien.\n"
 #define MSGTR_GUI_MSG_UnableToSaveOption "[cfg] Nie udało się zapisać opcji '%s'.\n"
-#define MSGTR_GUI_MSG_VideoOutError "Brak sterownika video zgodnego z GUI."
+#define MSGTR_GUI_MSG_VideoOutError "Brak sterownika video zgodnego z GUI.\n"
 #define MSGTR_GUI_MSG_XShapeError "Niestety Twój system nie obsługuje rozszerzenia XShape.\n"
 #define MSGTR_GUI_MSG_XSharedMemoryError "błąd rozszerzenia pamięci dzielonej\n"
 #define MSGTR_GUI_MSG_XSharedMemoryUnavailable "Niestety Twój system nie obsługuje rozszerzeń dzielonej pamięci X.\n"
@@ -819,6 +823,7 @@
 #define MSGTR_GUI_Video "Wideo"
 #define MSGTR_GUI_VideoEncoder "Koder video"
 #define MSGTR_GUI_VideoTracks "Ścieżka Wideo"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Uwaga!"
 
 // ======================= VO Video Output drivers ========================

MPlayer-1.2.r38170.tar.xz/help/help_mp-pt_BR.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-pt_BR.h Changed

@@ -337,6 +337,8 @@
 #define MSGTR_GUI_Cache "Cache"
 #define MSGTR_GUI_CacheSize "Tamaho do cache"
 #define MSGTR_GUI_Cancel "Cancelar"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Centro"
 #define MSGTR_GUI_Channel1 "Canal 1"
 #define MSGTR_GUI_Channel2 "Canal 2"
@@ -411,8 +413,8 @@
 #define MSGTR_GUI_Lavc "Usar LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Qualidade do audio"
 #define MSGTR_GUI_Miscellaneous "Misc"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Desculpe, você não pode reproduzir arquivos não-MPEG com o seu dispositivo DXR3/H+ sem recodificar.\nPor favor habilite lavc na configuração do DXR3/H+."
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Desculpe, sem memória suficiente para desenhar o buffer."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Desculpe, você não pode reproduzir arquivos não-MPEG com o seu dispositivo DXR3/H+ sem recodificar.\nPor favor habilite lavc na configuração do DXR3/H+.\n"
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Desculpe, sem memória suficiente para desenhar o buffer.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Nenhum arquivo carregado"
 #define MSGTR_GUI_MSG_NoMediaOpened "Nenhuma mídia aberta."
 #define MSGTR_GUI_MSG_PlaybackNeedsRestart "Por favor lembre que você precisa reiniciar a reprodução para algumas opções fazerem efeito!"
@@ -429,7 +431,7 @@
 #define MSGTR_GUI_MSG_SkinTooManyFonts "muitas fontes declaradas\n"
 #define MSGTR_GUI_MSG_SkinUnknownMessage "mensagem desconhecida: %s\n"
 #define MSGTR_GUI_MSG_SkinUnknownParameter "parâmetro desconhecido (%s)\n"
-#define MSGTR_GUI_MSG_VideoOutError "Desculpe, eu não encontrei um driver saída de vídeo compatível com GUI."
+#define MSGTR_GUI_MSG_VideoOutError "Desculpe, eu não encontrei um driver saída de vídeo compatível com GUI.\n"
 #define MSGTR_GUI_Mute "Mudo"
 #define MSGTR_GUI_NetworkStreaming "Rede..."
 #define MSGTR_GUI_Next "Próxima faixa"

MPlayer-1.2.r38170.tar.xz/help/help_mp-ro.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-ro.h Changed

@@ -295,6 +295,8 @@
 #define MSGTR_GUI_Cache "Cache"
 #define MSGTR_GUI_CacheSize "Dimensiune cache"
 #define MSGTR_GUI_Cancel "Anulare"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Centru"
 #define MSGTR_GUI_Channel1 "Canalul 1"
 #define MSGTR_GUI_Channel2 "Canalul 2"
@@ -369,11 +371,11 @@
 #define MSGTR_GUI_Lavc "Foloseºte LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Calitate auto"
 #define MSGTR_GUI_Miscellaneous "Altele"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Scuze, nu poþi afiºa fiºiere ne-MPEG cu dispozitivul DXR3/H+ fãrã recodare.\nActiveazã 'lavc' în cãsuþa de configurare pentru DXR3/H+."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Scuze, nu poþi afiºa fiºiere ne-MPEG cu dispozitivul DXR3/H+ fãrã recodare.\nActiveazã 'lavc' în cãsuþa de configurare pentru DXR3/H+.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Nici un fiºier încãrcat."
 #define MSGTR_GUI_MSG_NoMediaOpened "Nu e deschis nici un fiºier."
 #define MSGTR_GUI_MSG_PlaybackNeedsRestart "Nu uita cã rularea trebuie repornitã pentru ca unele opþiuni sã-ºi facã efectul!"
-#define MSGTR_GUI_MSG_VideoOutError "Scuze, nu am gãsit un driver video compatibil cu GUI."
+#define MSGTR_GUI_MSG_VideoOutError "Scuze, nu am gãsit un driver video compatibil cu GUI.\n"
 #define MSGTR_GUI_Mute "Fãrã sunet"
 #define MSGTR_GUI_NetworkStreaming "Streaming în reþea..."
 #define MSGTR_GUI_Next "Pista urmãtoare"

MPlayer-1.2.r38170.tar.xz/help/help_mp-ru.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-ru.h Changed

@@ -376,7 +376,7 @@
 #define MSGTR_VideoStreamRequired "Наличие потока видео обязательно!\n"
 #define MSGTR_ForcingInputFPS "входные кадры/сек будут заменены на %5.3f\n"
 #define MSGTR_DemuxerDoesntSupportNosound "Этот демультиплексор пока что не поддерживает -nosound.\n"
-#define MSGTR_MemAllocFailed "не могу выделить память"
+#define MSGTR_MemAllocFailed "не могу выделить память\n"
 #define MSGTR_NoMatchingFilter "Не могу найти соответствующий фильтр/формат_аудиовывода!\n"
 #define MSGTR_MP3WaveFormatSizeNot30 "sizeof(MPEGLAYER3WAVEFORMAT)==%d!=30, возможно, сломанный компилятор C?\n"
 #define MSGTR_NoLavcAudioCodecName "Аудио LAVC, пропущено имя кодека!\n"
@@ -514,6 +514,8 @@
 #define MSGTR_GUI_Cache "Кэш"
 #define MSGTR_GUI_CacheSize "Размер кэша"
 #define MSGTR_GUI_Cancel "Отмена"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Центральная"
 #define MSGTR_GUI_Channel1 "Канал 1"
 #define MSGTR_GUI_Channel2 "Канал 2"
@@ -530,6 +532,7 @@
 #define MSGTR_GUI_CodecFamilyVideo "Семейство видео кодеков"
 #define MSGTR_GUI_CodecsAndLibraries "Кодеки и сторонние библиотеки"
 #define MSGTR_GUI_Coefficient "Коэффициент"
+#define MSGTR_GUI_ConfigFileError "ошибка в конфигурационном файле\n"
 #define MSGTR_GUI_Configure "Настроить"
 #define MSGTR_GUI_ConfigureDriver "Настроить драйвер"
 #define MSGTR_GUI_Contrast "Контраст"
@@ -595,16 +598,17 @@
 #define MSGTR_GUI_Hue "Цвет"
 #define MSGTR_GUI_Lavc "Использовать LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Авто качество"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Разное"
 #define MSGTR_GUI_Mixer "Микшер"
 #define MSGTR_GUI_MixerChannel "Канал микшера"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Добавляю видеофильтр: %s\n"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Извините, глубина цвета слишком мала.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Ничего не возвращено!\n"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Извините, Вы не можете проигрывать не-MPEG файлы на Вашем DXR3/H+ устройстве\nбез перекодирования. Пожалуйста, включите lavc при конфигурации DXR3/H+."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Извините, Вы не можете проигрывать не-MPEG файлы на Вашем DXR3/H+ устройстве\nбез перекодирования. Пожалуйста, включите lavc при конфигурации DXR3/H+.\n"
 #define MSGTR_GUI_MSG_LoadingSubtitle "[GUI] Загружаю субтитры: %s\n"
 #define MSGTR_GUI_MSG_MemoryErrorImage "Извините, недостаточно памяти для буфера прорисовки.\n"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Извините, не хватает памяти для буфера прорисовки."
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Извините, не хватает памяти для буфера прорисовки.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Файл не загружен."
 #define MSGTR_GUI_MSG_NoMediaOpened "Носитель не открыт."
 #define MSGTR_GUI_MSG_NotAFile0 "Это не похоже на файл...\n"
@@ -630,7 +634,7 @@
 #define MSGTR_GUI_MSG_SkinUnknownParameter "неизвестный параметр (%s)\n"
 #define MSGTR_GUI_MSG_TooManyWindows "Слишком много открытых окон.\n"
 #define MSGTR_GUI_MSG_UnableToSaveOption "[cfg] Не могу сохранить опцию '%s'.\n"
-#define MSGTR_GUI_MSG_VideoOutError "Извините, не нашёл совместимый с GUI драйвер видео вывода."
+#define MSGTR_GUI_MSG_VideoOutError "Извините, не нашёл совместимый с GUI драйвер видео вывода.\n"
 #define MSGTR_GUI_MSG_XShapeError "Извините, ваша система не поддерживает расширение XShape.\n"
 #define MSGTR_GUI_MSG_XSharedMemoryError "ошибка расширения разделяемой памяти\n"
 #define MSGTR_GUI_MSG_XSharedMemoryUnavailable "Извините, ваша система не поддерживает расширение разделяемой памяти X'ов.\n"
@@ -702,6 +706,7 @@
 #define MSGTR_GUI_Video "Видео"
 #define MSGTR_GUI_VideoEncoder "Видео кодировщик"
 #define MSGTR_GUI_VideoTracks "Видео дорожка"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Предупреждение!"
 
 // ======================= video output drivers ========================

MPlayer-1.2.r38170.tar.xz/help/help_mp-sk.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-sk.h Changed

@@ -616,6 +616,8 @@
 #define MSGTR_GUI_Cache "Vyrovnávacia pamäť"
 #define MSGTR_GUI_CacheSize "Veľkosť vyr. pamäte"
 #define MSGTR_GUI_Cancel "Zrušiť"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Stredný"
 #define MSGTR_GUI_Channel1 "Kanál 1"
 #define MSGTR_GUI_Channel2 "Kanál 2"
@@ -632,6 +634,7 @@
 #define MSGTR_GUI_CodecFamilyVideo "Rodina video kodekov"
 #define MSGTR_GUI_CodecsAndLibraries "Kódeky a knižnice tretích strán"
 #define MSGTR_GUI_Coefficient "Koeficient"
+#define MSGTR_GUI_ConfigFileError "chyba konfiguračného súboru\n"
 #define MSGTR_GUI_Configure "Konfigurácia"
 #define MSGTR_GUI_ConfigureDriver "Konfigurovať ovládač"
 #define MSGTR_GUI_Contrast "Kontrast"
@@ -695,11 +698,12 @@
 #define MSGTR_GUI_Hue "Odtieň"
 #define MSGTR_GUI_Lavc "Použiť LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Automatická qualita"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Rôzne"
 #define MSGTR_GUI_Mixer "Mixér"
 #define MSGTR_GUI_MixerChannel "Kanál mixéru"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Žiaľ, nemôžete prehrávať nie mpeg súbory s DXR3/H+ zariadením bez prekódovania.\nProsím zapnite lavc v DXR3/H+ konfig. okne."
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Žiaľ, nedostatok pamäte pre buffer na kreslenie."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Žiaľ, nemôžete prehrávať nie mpeg súbory s DXR3/H+ zariadením bez prekódovania.\nProsím zapnite lavc v DXR3/H+ konfig. okne.\n"
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Žiaľ, nedostatok pamäte pre buffer na kreslenie.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Nenahraný žiaden súbor"
 #define MSGTR_GUI_MSG_NoMediaOpened "Nič nie je otvorené"
 #define MSGTR_GUI_MSG_PlaybackNeedsRestart "Prosím pamätajte, nietoré voľby potrebujú reštart prehrávania!"
@@ -719,7 +723,7 @@
 #define MSGTR_GUI_MSG_SkinTooManyFonts "príliš mnoho fontov deklarovaných\n"
 #define MSGTR_GUI_MSG_SkinUnknownMessage "neznáma správa: %s\n"
 #define MSGTR_GUI_MSG_SkinUnknownParameter "neznámy parameter (%s)\n"
-#define MSGTR_GUI_MSG_VideoOutError "Žiaľ, nemôžem nájsť gui kompatibilný ovládač video výstupu."
+#define MSGTR_GUI_MSG_VideoOutError "Žiaľ, nemôžem nájsť gui kompatibilný ovládač video výstupu.\n"
 #define MSGTR_GUI_Mute "Stlmiť zvuk"
 #define MSGTR_GUI_NetworkStreaming "Sieťové prehrávanie (streaming)..."
 #define MSGTR_GUI_Next "Ďalší prúd"
@@ -786,6 +790,7 @@
 #define MSGTR_GUI_Video "Video"
 #define MSGTR_GUI_VideoEncoder "Video kóder"
 #define MSGTR_GUI_VideoTracks "Video stopa"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Upozornenie!"
 
 // ========================== LIBMPCODECS ===================================

MPlayer-1.2.r38170.tar.xz/help/help_mp-sv.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-sv.h Changed

@@ -300,7 +300,7 @@
 #define MSGTR_VideoStreamRequired "Videoström är obligatoriskt!\n"
 #define MSGTR_ForcingInputFPS "'input fps' kommer att bli tolkad som %5.3f istället\n"
 #define MSGTR_DemuxerDoesntSupportNosound "Denna demuxer stödjer inte -nosound ännu.\n"
-#define MSGTR_MemAllocFailed "minnesallokering misslyckades"
+#define MSGTR_MemAllocFailed "minnesallokering misslyckades\n"
 #define MSGTR_NoMatchingFilter "Kunde inte finna matchande filter/ao-format!\n"
 #define MSGTR_MP3WaveFormatSizeNot30 "sizeof(MPEGLAYER3WAVEFORMAT)==%d!=30, kanske trasig C-kompilator?\n"
 #define MSGTR_NoLavcAudioCodecName "Audio LAVC, förkommet codecsnamn!\n"
@@ -526,6 +526,8 @@
 #define MSGTR_GUI_Cache "Cache"
 #define MSGTR_GUI_CacheSize "Cachestorlek"
 #define MSGTR_GUI_Cancel "Avbryt"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Center"
 #define MSGTR_GUI_Channel1 "Kanal 1"
 #define MSGTR_GUI_Channel2 "Kanal 2"
@@ -541,6 +543,7 @@
 #define MSGTR_GUI_CodecFamilyAudio "Audiocodecfamilj"
 #define MSGTR_GUI_CodecFamilyVideo "Videocodecfamilj"
 #define MSGTR_GUI_Coefficient "Koefficient"
+#define MSGTR_GUI_ConfigFileError "konfigurationsfilsfel\n"
 #define MSGTR_GUI_Configure "Konfiguration"
 #define MSGTR_GUI_ConfigureDriver "Konfigurera drivrution"
 #define MSGTR_GUI_Contrast "Kontrast"
@@ -601,11 +604,12 @@
 #define MSGTR_GUI_Hue "Hue"
 #define MSGTR_GUI_Lavc "ANvänd LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Autokvalité"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Diverse"
 #define MSGTR_GUI_Mixer "Mixer"
 #define MSGTR_GUI_MixerChannel "Mixerkanal"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Tyvärr, du kan inte spela icke-MPEG-filer med ditt DXR3/H+-enhet utan omkodning.\nVar god aktivera lavc i 'DXR3/H+'-konfigurationsboxen."
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Tyvärr, inte tillräckligt minne för ritbuffert."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Tyvärr, du kan inte spela icke-MPEG-filer med ditt DXR3/H+-enhet utan omkodning.\nVar god aktivera lavc i 'DXR3/H+'-konfigurationsboxen.\n"
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Tyvärr, inte tillräckligt minne för ritbuffert.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Ingen fil laddad"
 #define MSGTR_GUI_MSG_NoMediaOpened "Inget media öppnad"
 #define MSGTR_GUI_MSG_PlaybackNeedsRestart "Var god komihåg att du måste starta om uppspelning för att vissa ändringar ska ta effekt!"
@@ -622,7 +626,7 @@
 #define MSGTR_GUI_MSG_SkinTooManyFonts "Allt för många fonter deklarerade.\n"
 #define MSGTR_GUI_MSG_SkinUnknownMessage "okänt meddelande: %s\n"
 #define MSGTR_GUI_MSG_SkinUnknownParameter "okänd parameter (%s)\n"
-#define MSGTR_GUI_MSG_VideoOutError "Tyvärr, jag hittade inte en GUI-kompatibel video-ut-drivrutin."
+#define MSGTR_GUI_MSG_VideoOutError "Tyvärr, jag hittade inte en GUI-kompatibel video-ut-drivrutin.\n"
 #define MSGTR_GUI_Mute "Dämpa"
 #define MSGTR_GUI_NetworkStreaming "Nätverksströmning..."
 #define MSGTR_GUI_Next "Nästa ström"

MPlayer-1.2.r38170.tar.xz/help/help_mp-tr.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-tr.h Changed

@@ -676,6 +676,8 @@
 #define MSGTR_GUI_Cache "Önbellek"
 #define MSGTR_GUI_CacheSize "Önbellek boyutu"
 #define MSGTR_GUI_Cancel "İptal"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Merkez"
 #define MSGTR_GUI_Channel1 "Kanal 1"
 #define MSGTR_GUI_Channel2 "Kanal 2"
@@ -692,6 +694,7 @@
 #define MSGTR_GUI_CodecFamilyVideo "Video kodlama sınıfı"
 #define MSGTR_GUI_CodecsAndLibraries " Kodekler ve üçüncü parti kütüphaneleri"
 #define MSGTR_GUI_Coefficient "Katsayı"
+#define MSGTR_GUI_ConfigFileError "ayar dosyası hatası\n"
 #define MSGTR_GUI_Configure "Ayarla"
 #define MSGTR_GUI_ConfigureDriver "Sürücüyü Ayarla"
 #define MSGTR_GUI_Contrast "Karşıtlık"
@@ -757,16 +760,17 @@
 #define MSGTR_GUI_Hue "Renk"
 #define MSGTR_GUI_Lavc "LAVC kullan (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Otomatik kalite"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Çeşitli"
 #define MSGTR_GUI_Mixer "Karıştırıcı"
 #define MSGTR_GUI_MixerChannel "Karıştırıcı kanalı"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Video filtresi ekleniyor: %s\n"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Üzgünüm, renk derinliği çok düşük.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Hiçbirşey geri dönmedi!\n"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Üzgünüm, MPEG olmayan dosyaları DXR3/H+ aygıtınızla oynatamazsınız. \nLütfen DXR3/H+ ayarlarından lavc seçeneğini etkinleştirin."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Üzgünüm, MPEG olmayan dosyaları DXR3/H+ aygıtınızla oynatamazsınız. \nLütfen DXR3/H+ ayarlarından lavc seçeneğini etkinleştirin.\n"
 #define MSGTR_GUI_MSG_LoadingSubtitle "[GUI] Altyazılar yükleniyor: %s\n"
 #define MSGTR_GUI_MSG_MemoryErrorImage "Üzgünüm, ilerleme tamponu için yeterli bellek yok.\n"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Üzgünüm, tampon için yeterli hafıza yok."
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Üzgünüm, tampon için yeterli hafıza yok.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Dosya yüklenemedi"
 #define MSGTR_GUI_MSG_NoMediaOpened "Medya yok"
 #define MSGTR_GUI_MSG_NotAFile0 " Bu bir dosya olarak görünmüyor...\n"
@@ -792,7 +796,7 @@
 #define MSGTR_GUI_MSG_SkinUnknownParameter "bilinmeyen parametre (%s)\n"
 #define MSGTR_GUI_MSG_TooManyWindows "Çok sayıda açık pencere var.\n"
 #define MSGTR_GUI_MSG_UnableToSaveOption "[cfg] '%s' seçeneği kaydedilemiyor.\n"
-#define MSGTR_GUI_MSG_VideoOutError "Üzgünüm, KGA ile uyumlu video çıkış sürücüsü bulunamadı."
+#define MSGTR_GUI_MSG_VideoOutError "Üzgünüm, KGA ile uyumlu video çıkış sürücüsü bulunamadı.\n"
 #define MSGTR_GUI_MSG_XShapeError "Üzgünüm, sisteminiz Xshape genişletmesini desteklemiyor.\n"
 #define MSGTR_GUI_MSG_XSharedMemoryError "paylaşımlı bellek genişletme hatası\n"
 #define MSGTR_GUI_MSG_XSharedMemoryUnavailable "Üzgünüm, sisteminiz X paylaşımlı bellek genişletmesini desteklemiyor.\n"
@@ -864,6 +868,7 @@
 #define MSGTR_GUI_Video "Video"
 #define MSGTR_GUI_VideoEncoder "Video kodlayıcı"
 #define MSGTR_GUI_VideoTracks "Video parçası"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Uyarı!"
 
 // ======================= VO Video Output drivers ========================

MPlayer-1.2.r38170.tar.xz/help/help_mp-uk.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-uk.h Changed

@@ -509,6 +509,8 @@
 #define MSGTR_GUI_Cache "Кеш"
 #define MSGTR_GUI_CacheSize "Розмір кешу"
 #define MSGTR_GUI_Cancel "Відміна"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "Центральний"
 #define MSGTR_GUI_Channel1 "Канал 1"
 #define MSGTR_GUI_Channel2 "Канал 2"
@@ -525,6 +527,7 @@
 #define MSGTR_GUI_CodecFamilyVideo "Драйвер відео содеку"
 #define MSGTR_GUI_CodecsAndLibraries "Кодеки та сторонні бібліотеки"
 #define MSGTR_GUI_Coefficient "Коефіціент"
+#define MSGTR_GUI_ConfigFileError "помилка у файлі налаштувань\n"
 #define MSGTR_GUI_Configure "Налаштунки"
 #define MSGTR_GUI_ConfigureDriver "Налаштувати драйвер"
 #define MSGTR_GUI_Contrast "Контраст"
@@ -589,16 +592,17 @@
 #define MSGTR_GUI_Hue "Тон"
 #define MSGTR_GUI_Lavc "Використовувати LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "Авто якість"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "Різне"
 #define MSGTR_GUI_Mixer "Мікшер"
 #define MSGTR_GUI_MixerChannel "Канал мікшеру"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Додаю відео фільтр: %s\n"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Вибачте, глибина кольору занизька.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Нічого не повернено!\n"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "Вибачте, ви не можете програвати не MPEG файли з вашим DXR3/H+ пристроєм без перекодування.\nВключіть lavc у нашалтунки DXR3/H+."
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "Вибачте, ви не можете програвати не MPEG файли з вашим DXR3/H+ пристроєм без перекодування.\nВключіть lavc у нашалтунки DXR3/H+.\n"
 #define MSGTR_GUI_MSG_LoadingSubtitle "[GUI] Вантажу субтитри: %s\n"
 #define MSGTR_GUI_MSG_MemoryErrorImage "Вибачте, не достатньо пам'яті для прорисування буферу.\n"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "Вибачте, не достатньо пам'яті для прорисовки буферу."
+#define MSGTR_GUI_MSG_MemoryErrorWindow "Вибачте, не достатньо пам'яті для прорисовки буферу.\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "Файл не завантжено."
 #define MSGTR_GUI_MSG_NoMediaOpened "Носій не відкритий."
 #define MSGTR_GUI_MSG_NotAFile0 "Здається, це не файл...\n"
@@ -624,7 +628,7 @@
 #define MSGTR_GUI_MSG_SkinUnknownParameter "невідомий параметр (%s)\n"
 #define MSGTR_GUI_MSG_TooManyWindows "Забагато відкритих вікон.\n"
 #define MSGTR_GUI_MSG_UnableToSaveOption "[cfg] Не можу зберегти '%s' опцію.\n"
-#define MSGTR_GUI_MSG_VideoOutError "Вибачте, не знаходжу відео драйвер для підтримки GUI."
+#define MSGTR_GUI_MSG_VideoOutError "Вибачте, не знаходжу відео драйвер для підтримки GUI.\n"
 #define MSGTR_GUI_MSG_XShapeError "Вибачте, здається, ваша система не підтримує розширення XShape.\n"
 #define MSGTR_GUI_MSG_XSharedMemoryError "помилка розширення загальної пам'яті\n"
 #define MSGTR_GUI_MSG_XSharedMemoryUnavailable "Вибачте, ваша система не підтримує розширення загальної пам'яті X.\n"
@@ -696,6 +700,7 @@
 #define MSGTR_GUI_Video "Відео"
 #define MSGTR_GUI_VideoEncoder "Відео кодек"
 #define MSGTR_GUI_VideoTracks "Відео доріжка"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "Попередження!"
 
 // ======================= video output drivers ========================

MPlayer-1.2.r38170.tar.xz/help/help_mp-zh_CN.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-zh_CN.h Changed

@@ -542,6 +542,8 @@
 #define MSGTR_GUI_Cache "缓冲"
 #define MSGTR_GUI_CacheSize "缓存大小"
 #define MSGTR_GUI_Cancel "取消"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_CD "CD"
 #define MSGTR_GUI_Center "中置"
 #define MSGTR_GUI_Channel1 "声道 1"
@@ -558,12 +560,13 @@
 #define MSGTR_GUI_CodecFamilyAudio "音频编解码器类"
 #define MSGTR_GUI_CodecFamilyVideo "视频编解码器类"
 #define MSGTR_GUI_Codecs "编解码器"
-#define MSGTR_GUI_CodecsAndLibraries "编解码器和第三方程序库\n"
+#define MSGTR_GUI_CodecsAndLibraries "编解码器和第三方程序库"
 #define MSGTR_GUI_Coefficient "参数"
+#define MSGTR_GUI_ConfigFileError "配置文件错误\n"
 #define MSGTR_GUI_Configure "配置"
 #define MSGTR_GUI_ConfigureDriver "配置驱动程序"
 #define MSGTR_GUI_Contrast "对比度"
-#define MSGTR_GUI_Contributors "代码和文档贡献者\n"
+#define MSGTR_GUI_Contributors "代码和文档贡献者"
 #define MSGTR_GUI_Cp874 "泰文（CP874）"
 #define MSGTR_GUI_Cp932 "日文（CP932）"
 #define MSGTR_GUI_Cp936 "简体中文（CP936）"
@@ -687,6 +690,7 @@
 #define MSGTR_GUI_Information "信息"
 #define MSGTR_GUI_Lavc "lavc（实时 mpeg1 编码）"
 #define MSGTR_GUI_MaximumUsageSpareCPU "空闲 CPU 时间的最大使用量"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "杂项"
 #define MSGTR_GUI_Mixer "混音器"
 #define MSGTR_GUI_MixerChannel "混音器声道"
@@ -798,8 +802,8 @@
 #define MSGTR_GUI_SizeOSD "尺寸（OSD）"
 #define MSGTR_GUI_SizeSubtitles "尺寸（字幕）"
 #define MSGTR_GUI_SkinBrowser "播放器外观浏览器"
-#define MSGTR_GUI_Skins "界面外观\n"
-#define MSGTR_GUI_Sponsored "图形用户界面的开发已由 UHU-Linux 赞助\n"
+#define MSGTR_GUI_Skins "界面外观"
+#define MSGTR_GUI_Sponsored "图形用户界面的开发已由 UHU-Linux 赞助"
 #define MSGTR_GUI_StartFullscreen "以全屏方式启动"
 #define MSGTR_GUI_Stop "停止"
 #define MSGTR_GUI_Subtitle "字幕"
@@ -815,7 +819,7 @@
 #define MSGTR_GUI_Titles "所有标题"
 #define MSGTR_GUI_Top "顶部"
 #define MSGTR_GUI_TrackN "通道 %d"
-#define MSGTR_GUI_Translations "翻译\n"
+#define MSGTR_GUI_Translations "翻译"
 #define MSGTR_GUI_TurnOffXScreenSaver "关闭 XScreenSaver 屏保"
 #define MSGTR_GUI_TV "电视"
 #define MSGTR_GUI_Unknown "未知"
@@ -824,11 +828,14 @@
 #define MSGTR_GUI_Video "视频"
 #define MSGTR_GUI_VideoEncoder "视频编解码器"
 #define MSGTR_GUI_VideoTracks "视频通道"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "警告"
 
 #define MSGTR_GUI_WIN32_AddFile "添加文件"
 #define MSGTR_GUI_WIN32_AddURL "添加网络地址"
+#define MSGTR_GUI_WIN32_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_WIN32_Close "关闭"
+#define MSGTR_GUI_WIN32_ConfigFileError MSGTR_GUI_ConfigFileError
 #define MSGTR_GUI_WIN32_DebugConsole "调试控制终端"
 #define MSGTR_GUI_WIN32_Defaults "默认值"
 #define MSGTR_GUI_WIN32_DirectoryList "目录列表"

MPlayer-1.2.r38170.tar.xz/help/help_mp-zh_TW.h -> MPlayer-1.2.r38304.tar.xz/help/help_mp-zh_TW.h Changed

@@ -649,6 +649,8 @@
 #define MSGTR_GUI_Cache "緩存"
 #define MSGTR_GUI_CacheSize "緩存大小"
 #define MSGTR_GUI_Cancel "取消"
+#define MSGTR_GUI_CantLoadFont MSGTR_CantLoadFont
+#define MSGTR_GUI_CantLoadSub MSGTR_CantLoadSub
 #define MSGTR_GUI_Center "中間"
 #define MSGTR_GUI_Channel1 "聲道 1"
 #define MSGTR_GUI_Channel2 "聲道 2"
@@ -665,6 +667,7 @@
 #define MSGTR_GUI_CodecFamilyVideo "視頻解碼器族"
 #define MSGTR_GUI_CodecsAndLibraries "編解碼器和第三方庫"
 #define MSGTR_GUI_Coefficient "參數"
+#define MSGTR_GUI_ConfigFileError "配置文件錯誤\n"
 #define MSGTR_GUI_Configure "配置"
 #define MSGTR_GUI_ConfigureDriver "配置驅動"
 #define MSGTR_GUI_Contrast "對比度"
@@ -729,16 +732,17 @@
 #define MSGTR_GUI_Hue "色調"
 #define MSGTR_GUI_Lavc "使用 LAVC (FFmpeg)"
 #define MSGTR_GUI_MaximumUsageSpareCPU "自動品質控製"
+#define MSGTR_GUI_MemAllocFailed MSGTR_MemAllocFailed
 #define MSGTR_GUI_Miscellaneous "其他"
 #define MSGTR_GUI_Mixer "混音器"
 #define MSGTR_GUI_MixerChannel "混音通道"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] 添加視頻過濾器: %s\n"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "抱歉, 色彩深度太低。\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: 没有任何東西返回!\n"
-#define MSGTR_GUI_MSG_DXR3NeedsLavc "抱歉, 不能用没有重編碼的 DXR3/H+ 設備播放 non-MPEG 文件\n請啟用 DXR3/H+ 配置盒中的 lavc。"
+#define MSGTR_GUI_MSG_DXR3NeedsLavc "抱歉, 不能用没有重編碼的 DXR3/H+ 設備播放 non-MPEG 文件\n請啟用 DXR3/H+ 配置盒中的 lavc。\n"
 #define MSGTR_GUI_MSG_LoadingSubtitle "[GUI] 導入字幕: %s\n"
 #define MSGTR_GUI_MSG_MemoryErrorImage "抱歉, 内存不够繪製緩衝。\n"
-#define MSGTR_GUI_MSG_MemoryErrorWindow "抱歉, 没有足够的内存用于繪製緩衝。"
+#define MSGTR_GUI_MSG_MemoryErrorWindow "抱歉, 没有足够的内存用于繪製緩衝。\n"
 #define MSGTR_GUI_MSG_NoFileLoaded "没有載入文件"
 #define MSGTR_GUI_MSG_NoMediaOpened "没有打開媒體"
 #define MSGTR_GUI_MSG_NotAFile0 "這好像不是一個文件...\n"
@@ -764,7 +768,7 @@
 #define MSGTR_GUI_MSG_SkinUnknownParameter "未知參數 (%s)\n"
 #define MSGTR_GUI_MSG_TooManyWindows "打開窗口太多。\n"
 #define MSGTR_GUI_MSG_UnableToSaveOption "[cfg] 無法保存 '%s' 選項。\n"
-#define MSGTR_GUI_MSG_VideoOutError "抱歉, 未找到 GUI-兼容的視頻輸出驅動。"
+#define MSGTR_GUI_MSG_VideoOutError "抱歉, 未找到 GUI-兼容的視頻輸出驅動。\n"
 #define MSGTR_GUI_MSG_XShapeError "抱歉, 你的係統不支持 XShape 擴展。\n"
 #define MSGTR_GUI_MSG_XSharedMemoryError "共享内存擴展錯誤\n"
 #define MSGTR_GUI_MSG_XSharedMemoryUnavailable "抱歉, 你的係統不支持 X 共享内存擴展。\n"
@@ -836,6 +840,7 @@
 #define MSGTR_GUI_Video "視頻"
 #define MSGTR_GUI_VideoEncoder "視頻編碼器"
 #define MSGTR_GUI_VideoTracks "視頻軌迹"
+#define MSGTR_GUI_Volume MSGTR_Volume
 #define MSGTR_GUI_Warning "警告!"
 
 // ======================= VO Video Output drivers ========================

MPlayer-1.2.r38170.tar.xz/input/input.c -> MPlayer-1.2.r38304.tar.xz/input/input.c Changed

@@ -20,13 +20,14 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_POSIX_SELECT
 #include <sys/time.h>
+#endif
 #include <fcntl.h>
 #include <ctype.h>
 
@@ -212,7 +213,7 @@
 
   { MP_CMD_GUI, "gui", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } },
 
-  { 0, "", 0, {} }
+  { 0, "", 0, { 0 } }
 };
 
 /// The names of the keys as used in input.conf
@@ -820,7 +821,7 @@
     return NULL;
 
   for(i=0; mp_cmds[i].name[0]; i++) {
-    if(strncasecmp(mp_cmds[i].name,str,l) == 0)
+    if(av_strncasecmp(mp_cmds[i].name,str,l) == 0)
       break;
   }
 
@@ -1488,11 +1489,11 @@
   if(len == 1) { // Direct key code
     ret = (unsigned char)name[0];
     return ret;
-  } else if(len > 2 && strncasecmp("0x",name,2) == 0)
+  } else if(len > 2 && av_strncasecmp("0x",name,2) == 0)
     return strtol(name,NULL,16);
 
   for(i = 0; key_names[i].name[0]; i++) {
-    if(strcasecmp(key_names[i].name,name) == 0)
+    if(av_strcasecmp(key_names[i].name,name) == 0)
       return key_names[i].key;
   }

MPlayer-1.2.r38170.tar.xz/libaf/af_scaletempo.c -> MPlayer-1.2.r38304.tar.xz/libaf/af_scaletempo.c Changed

MPlayer-1.2.r38170.tar.xz/libaf/format.c -> MPlayer-1.2.r38304.tar.xz/libaf/format.c Changed

MPlayer-1.2.r38170.tar.xz/libao2/ao_alsa.c -> MPlayer-1.2.r38304.tar.xz/libao2/ao_alsa.c Changed

MPlayer-1.2.r38170.tar.xz/libao2/ao_coreaudio.c -> MPlayer-1.2.r38304.tar.xz/libao2/ao_coreaudio.c Changed

MPlayer-1.2.r38170.tar.xz/libao2/ao_dsound.c -> MPlayer-1.2.r38304.tar.xz/libao2/ao_dsound.c Changed

@@ -330,14 +330,14 @@
   	    numsamp = dwBytes1 / (ao_data.channels * sampsize);  // number of samples for each channel in this buffer
 
   	    for( i = 0; i < numsamp; i++ ) for( j = 0; j < ao_data.channels; j++ ) {
-  	        memcpy(lpvPtr1+(i*ao_data.channels*sampsize)+(chantable[j]*sampsize),data+(i*ao_data.channels*sampsize)+(j*sampsize),sampsize);
+  	        memcpy((char *)lpvPtr1+(i*ao_data.channels*sampsize)+(chantable[j]*sampsize),data+(i*ao_data.channels*sampsize)+(j*sampsize),sampsize);
   	    }
 
   	    if (NULL != lpvPtr2 )
   	    {
   	        numsamp = dwBytes2 / (ao_data.channels * sampsize);
   	        for( i = 0; i < numsamp; i++ ) for( j = 0; j < ao_data.channels; j++ ) {
-  	            memcpy(lpvPtr2+(i*ao_data.channels*sampsize)+(chantable[j]*sampsize),data+dwBytes1+(i*ao_data.channels*sampsize)+(j*sampsize),sampsize);
+  	            memcpy((char *)lpvPtr2+(i*ao_data.channels*sampsize)+(chantable[j]*sampsize),data+dwBytes1+(i*ao_data.channels*sampsize)+(j*sampsize),sampsize);
   	        }
   	    }

MPlayer-1.2.r38170.tar.xz/libao2/ao_mpegpes.c -> MPlayer-1.2.r38304.tar.xz/libao2/ao_mpegpes.c Changed

MPlayer-1.2.r38170.tar.xz/libao2/ao_null.c -> MPlayer-1.2.r38304.tar.xz/libao2/ao_null.c Changed

@@ -20,9 +20,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/time.h>
 
 #include "config.h"
+#include "osdep/timer.h"
 #include "libaf/af_format.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
@@ -37,28 +37,19 @@
 
 LIBAO_EXTERN(null)
 
-static struct	timeval last_tv;
+static unsigned last;
 static int	buffer;
 
 static void drain(void){
-
-    struct timeval now_tv;
-    int temp, temp2;
-
-    gettimeofday(&now_tv, 0);
-    temp = now_tv.tv_sec - last_tv.tv_sec;
+    unsigned now = GetTimerMS();
+    unsigned long long temp = now - last;
     temp *= ao_data.bps;
+    temp /= 1000;
 
-    temp2 = now_tv.tv_usec - last_tv.tv_usec;
-    temp2 /= 1000;
-    temp2 *= ao_data.bps;
-    temp2 /= 1000;
-    temp += temp2;
-
-    buffer-=temp;
-    if (buffer<0) buffer=0;
+    if (temp > buffer) buffer=0;
+    else buffer-=temp;
 
-    if(temp>0) last_tv = now_tv;//mplayer is fast
+    last = now;
 }
 
 // to set/get/query special features/parameters
@@ -79,7 +70,7 @@
     ao_data.format=format;
     ao_data.bps=channels*rate*samplesize;
     buffer=0;
-    gettimeofday(&last_tv, 0);
+    last = GetTimerMS();
 
     return 1;
 }

MPlayer-1.2.r38170.tar.xz/libao2/ao_oss.c -> MPlayer-1.2.r38304.tar.xz/libao2/ao_oss.c Changed

MPlayer-1.2.r38170.tar.xz/libass/ass.c -> MPlayer-1.2.r38304.tar.xz/libass/ass.c Changed

@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -34,6 +33,7 @@
 #include <iconv.h>
 #endif
 
+#include "libavutil/avstring.h"
 #include "ass.h"
 #include "ass_utils.h"
 #include "ass_library.h"
@@ -230,35 +230,35 @@
 	if (!token) break;
 
 #define ANYVAL(name,func) \
-	} else if (strcasecmp(tname, #name) == 0) { \
+	} else if (av_strcasecmp(tname, #name) == 0) { \
 		target->name = func(token); \
 		ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
 
 #define STRVAL(name) \
-	} else if (strcasecmp(tname, #name) == 0) { \
+	} else if (av_strcasecmp(tname, #name) == 0) { \
 		if (target->name != NULL) free(target->name); \
 		target->name = strdup(token); \
 		ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
 
 #define COLORVAL(name) \
-	} else if (strcasecmp(tname, #name) == 0) { \
+	} else if (av_strcasecmp(tname, #name) == 0) { \
 		target->name = string2color(track->library, token); \
 		ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
 
 #define INTVAL(name) ANYVAL(name,atoi)
 #define FPVAL(name) ANYVAL(name,ass_atof)
 #define TIMEVAL(name) \
-	} else if (strcasecmp(tname, #name) == 0) { \
+	} else if (av_strcasecmp(tname, #name) == 0) { \
 		target->name = string2timecode(track->library, token); \
 		ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
 
 #define STYLEVAL(name) \
-	} else if (strcasecmp(tname, #name) == 0) { \
+	} else if (av_strcasecmp(tname, #name) == 0) { \
 		target->name = lookup_style(track, token); \
 		ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
 
 #define ALIAS(alias,name) \
-	if (strcasecmp(tname, #alias) == 0) {tname = #name;}
+	if (av_strcasecmp(tname, #alias) == 0) {tname = #name;}
 
 static char *next_token(char **str)
 {
@@ -321,7 +321,7 @@
 
     while (1) {
         NEXT(q, tname);
-        if (strcasecmp(tname, "Text") == 0) {
+        if (av_strcasecmp(tname, "Text") == 0) {
             char *last;
             event->Text = strdup(p);
             if (*event->Text != 0) {
@@ -375,19 +375,19 @@
         *eq = '\0';
         token = eq + 1;
 
-        if (!strcasecmp(*fs, "PlayResX"))
+        if (!av_strcasecmp(*fs, "PlayResX"))
             track->PlayResX = atoi(token);
-        else if (!strcasecmp(*fs, "PlayResY"))
+        else if (!av_strcasecmp(*fs, "PlayResY"))
             track->PlayResY = atoi(token);
-        else if (!strcasecmp(*fs, "Timer"))
+        else if (!av_strcasecmp(*fs, "Timer"))
             track->Timer = ass_atof(token);
-        else if (!strcasecmp(*fs, "WrapStyle"))
+        else if (!av_strcasecmp(*fs, "WrapStyle"))
             track->WrapStyle = atoi(token);
-        else if (!strcasecmp(*fs, "ScaledBorderAndShadow"))
+        else if (!av_strcasecmp(*fs, "ScaledBorderAndShadow"))
             track->ScaledBorderAndShadow = parse_bool(token);
-        else if (!strcasecmp(*fs, "Kerning"))
+        else if (!av_strcasecmp(*fs, "Kerning"))
             track->Kerning = parse_bool(token);
-        else if (!strcasecmp(*fs, "YCbCr Matrix"))
+        else if (!av_strcasecmp(*fs, "YCbCr Matrix"))
             track->YCbCrMatrix = parse_ycbcr_matrix(token);
 
         dt = strrchr(*fs, '.');
@@ -401,7 +401,7 @@
         }
         for (sid = 0; sid < track->n_styles; ++sid) {
             if (style == NULL
-                || strcasecmp(track->styles[sid].Name, style) == 0) {
+                || av_strcasecmp(track->styles[sid].Name, style) == 0) {
                 target = track->styles + sid;
                 if (0) {
                     STRVAL(FontName)
@@ -748,17 +748,17 @@
 */
 static int process_line(ASS_Track *track, char *str)
 {
-    if (!strncasecmp(str, "[Script Info]", 13)) {
+    if (!av_strncasecmp(str, "[Script Info]", 13)) {
         track->parser_priv->state = PST_INFO;
-    } else if (!strncasecmp(str, "[V4 Styles]", 11)) {
+    } else if (!av_strncasecmp(str, "[V4 Styles]", 11)) {
         track->parser_priv->state = PST_STYLES;
         track->track_type = TRACK_TYPE_SSA;
-    } else if (!strncasecmp(str, "[V4+ Styles]", 12)) {
+    } else if (!av_strncasecmp(str, "[V4+ Styles]", 12)) {
         track->parser_priv->state = PST_STYLES;
         track->track_type = TRACK_TYPE_ASS;
-    } else if (!strncasecmp(str, "[Events]", 8)) {
+    } else if (!av_strncasecmp(str, "[Events]", 8)) {
         track->parser_priv->state = PST_EVENTS;
-    } else if (!strncasecmp(str, "[Fonts]", 7)) {
+    } else if (!av_strncasecmp(str, "[Fonts]", 7)) {
         track->parser_priv->state = PST_FONTS;
     } else {
         switch (track->parser_priv->state) {

MPlayer-1.2.r38170.tar.xz/libass/ass_font.c -> MPlayer-1.2.r38304.tar.xz/libass/ass_font.c Changed

MPlayer-1.2.r38170.tar.xz/libass/ass_fontconfig.c -> MPlayer-1.2.r38304.tar.xz/libass/ass_fontconfig.c Changed

@@ -22,13 +22,13 @@
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <inttypes.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
+#include "libavutil/avstring.h"
 #include "ass_utils.h"
 #include "ass.h"
 #include "ass_library.h"
@@ -94,7 +94,7 @@
                 if (FcPatternGetInteger(pat, FC_WEIGHT, 0, &at) != FcResultMatch
                     || at < bold)
                     continue;
-                if (strcasecmp(fullname, family) == 0) {
+                if (av_strcasecmp(fullname, family) == 0) {
                     FcFontSetAdd(result, FcPatternDuplicate(pat));
                     break;
                 }
@@ -256,8 +256,8 @@
         r_fullname = NULL;
 
     if (!treat_family_as_pattern &&
-        !(r_family && strcasecmp((const char *) r_family, family) == 0) &&
-        !(r_fullname && strcasecmp((const char *) r_fullname, family) == 0))
+        !(r_family && av_strcasecmp((const char *) r_family, family) == 0) &&
+        !(r_fullname && av_strcasecmp((const char *) r_fullname, family) == 0))
         ass_msg(library, MSGL_WARN,
                "fontconfig: Selected font is not the requested one: "
                "'%s' != '%s'",

MPlayer-1.2.r38170.tar.xz/libass/ass_utils.c -> MPlayer-1.2.r38304.tar.xz/libass/ass_utils.c Changed

@@ -23,8 +23,8 @@
 #include <inttypes.h>
 #include <ft2build.h>
 #include FT_GLYPH_H
-#include <strings.h>
 
+#include "libavutil/avstring.h"
 #include "ass_library.h"
 #include "ass.h"
 #include "ass_utils.h"
@@ -115,7 +115,7 @@
 {
     while (*str == ' ' || *str == '\t')
         str++;
-    if (!strncasecmp(str, "yes", 3))
+    if (!av_strncasecmp(str, "yes", 3))
         return 1;
     else if (strtol(str, NULL, 10) > 0)
         return 1;
@@ -141,23 +141,23 @@
     strncpy(buffer, str, n);
     buffer[n] = '\0';
 
-    if (!strcasecmp(buffer, "none"))
+    if (!av_strcasecmp(buffer, "none"))
         return YCBCR_NONE;
-    if (!strcasecmp(buffer, "tv.601"))
+    if (!av_strcasecmp(buffer, "tv.601"))
         return YCBCR_BT601_TV;
-    if (!strcasecmp(buffer, "pc.601"))
+    if (!av_strcasecmp(buffer, "pc.601"))
         return YCBCR_BT601_PC;
-    if (!strcasecmp(buffer, "tv.709"))
+    if (!av_strcasecmp(buffer, "tv.709"))
         return YCBCR_BT709_TV;
-    if (!strcasecmp(buffer, "pc.709"))
+    if (!av_strcasecmp(buffer, "pc.709"))
         return YCBCR_BT709_PC;
-    if (!strcasecmp(buffer, "tv.240m"))
+    if (!av_strcasecmp(buffer, "tv.240m"))
         return YCBCR_SMPTE240M_TV;
-    if (!strcasecmp(buffer, "pc.240m"))
+    if (!av_strcasecmp(buffer, "pc.240m"))
         return YCBCR_SMPTE240M_PC;
-    if (!strcasecmp(buffer, "tv.fcc"))
+    if (!av_strcasecmp(buffer, "tv.fcc"))
         return YCBCR_FCC_TV;
-    if (!strcasecmp(buffer, "pc.fcc"))
+    if (!av_strcasecmp(buffer, "pc.fcc"))
         return YCBCR_FCC_PC;
     return YCBCR_UNKNOWN;
 }
@@ -245,7 +245,7 @@
     for (i = 0; i < langcnt; i++) {
         const char *tmp;
 
-        if (strcasecmp(languages[i], preferred_language) != 0)
+        if (av_strcasecmp(languages[i], preferred_language) != 0)
             continue;
         analyser = enca_analyser_alloc(languages[i]);
         encoding = enca_analyse_const(analyser, buffer, buflen);

MPlayer-1.2.r38170.tar.xz/libmenu/menu.c -> MPlayer-1.2.r38304.tar.xz/libmenu/menu.c Changed

@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -37,6 +36,8 @@
 
 #include "libmpcodecs/img_format.h"
 #include "libmpcodecs/mp_image.h"
+#include "libavutil/avstring.h"
+#include "libavutil/mem.h"
 #include "m_option.h"
 #include "m_struct.h"
 #include "menu.h"
@@ -99,7 +100,7 @@
 {
   int i;
   for (i = 0; i < cmd_bindings_num; ++i)
-    if (!strcasecmp(cmd_bindings[i].name, name))
+    if (!av_strcasecmp(cmd_bindings[i].name, name))
       return &cmd_bindings[i];
   return NULL;
 }
@@ -130,7 +131,7 @@
       continue;
     }
 
-    if (!strcasecmp(element, "keybindings")) {
+    if (!av_strcasecmp(element, "keybindings")) {
       menu_cmd_bindings_t *bindings = cmd_bindings;
       char *parent_bindings;
       cmd_bindings = realloc(cmd_bindings,
@@ -163,7 +164,7 @@
           }
           if(r == 0)
             break;
-          if (!strcasecmp(element, "binding")) {
+          if (!av_strcasecmp(element, "binding")) {
             key = asx_get_attrib("key",attribs);
             cmd = asx_get_attrib("cmd",attribs);
             if (key && (keycode = mp_input_get_key_from_name(key)) >= 0) {
@@ -192,7 +193,7 @@
     }
     // Try to find this menu type in our list
     for(i = 0, minfo = NULL ; menu_info_list[i] ; i++) {
-      if(strcasecmp(element,menu_info_list[i]->name) == 0) {
+      if(av_strcasecmp(element,menu_info_list[i]->name) == 0) {
 	minfo = menu_info_list[i];
 	break;
       }
@@ -206,7 +207,7 @@
       menu_list[menu_count].args = body;
       // Setup the attribs
       for(i = 0 ; attribs[2*i] ; i++) {
-	if(strcasecmp(attribs[2*i],"name") == 0) continue;
+	if(av_strcasecmp(attribs[2*i],"name") == 0) continue;
 	if(!m_struct_set(&minfo->priv_st,menu_list[menu_count].cfg,attribs[2*i], attribs[2*i+1]))
 	  mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_BadAttrib,attribs[2*i],attribs[2*i+1],
 		 name,parser->line);
@@ -745,13 +746,15 @@
   if(g < 1) g = 1;
 
   {
-    int stride = (w+7)&(~7); // round to 8
-    char pic[stride*h],pic_alpha[stride*h];
-    memset(pic,g,stride*h);
-    memset(pic_alpha,alpha,stride*h);
-    draw_alpha(w,h,pic,pic_alpha,stride,
+    int stride = (w+15)&(~15); // round to 16
+    char *pic = av_malloc(2*stride);
+    char *pic_alpha = pic + stride;
+    memset(pic,g,stride);
+    memset(pic_alpha,alpha,stride);
+    draw_alpha(w,h,pic,pic_alpha,0,
                mpi->planes[0] + y * mpi->stride[0] + x * (mpi->bpp>>3),
                mpi->stride[0]);
+    av_freep(&pic);
   }
 
 }

MPlayer-1.2.r38170.tar.xz/libmenu/menu_console.c -> MPlayer-1.2.r38304.tar.xz/libmenu/menu_console.c Changed

@@ -20,18 +20,26 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
+#ifdef HAVE_POSIX_SELECT
+#define RUN_CMD 1
+#else
+#define RUN_CMD 0
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <sys/time.h>
 #include <sys/types.h>
-#ifndef __MINGW32__
+#if RUN_CMD
 #include <sys/wait.h>
+#include <sys/time.h>
 #endif
 #include <unistd.h>
 #include <errno.h>
 
+#include "libavutil/mem.h"
+#include "libavutil/avstring.h"
 #include "libmpcodecs/img_format.h"
 #include "libmpcodecs/mp_image.h"
 
@@ -217,12 +225,12 @@
     menu_draw_box(mpi,mpriv->bg,mpriv->bg_alpha,0,0,mpi->w,h);
 
   if(!mpriv->child || !mpriv->raw_child){
-    char input[strlen(mpriv->cur_history->buffer) + strlen(mpriv->prompt) + 1];
-    sprintf(input,"%s%s",mpriv->prompt,mpriv->cur_history->buffer);
+    char *input = av_asprintf("%s%s",mpriv->prompt,mpriv->cur_history->buffer);
     menu_text_size(input,w,mpriv->vspace,1,&lw,&lh);
     menu_draw_text_full(mpi,input,x,y,w,h,mpriv->vspace,1,
 			MENU_TEXT_BOT|MENU_TEXT_LEFT,
 			MENU_TEXT_BOT|MENU_TEXT_LEFT);
+    av_freep(&input);
     y -= lh + mpriv->vspace;
   }
 
@@ -239,7 +247,7 @@
 }
 
 static void check_child(menu_t* menu) {
-#ifndef __MINGW32__
+#if RUN_CMD
   fd_set rfd;
   struct timeval tv;
   int max_fd = mpriv->child_fd[2] > mpriv->child_fd[1] ? mpriv->child_fd[2] :
@@ -293,7 +301,7 @@
 #define close_pipe(pipe) close(pipe[0]); close(pipe[1])
 
 static int run_shell_cmd(menu_t* menu, char* cmd) {
-#ifndef __MINGW32__
+#if RUN_CMD
   int in[2],out[2],err[2];
 
   mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_LIBMENU_ConsoleRun,cmd);
@@ -342,10 +350,9 @@
 
 static void enter_cmd(menu_t* menu) {
   history_t* h;
-  char input[strlen(mpriv->cur_history->buffer) + strlen(mpriv->prompt) + 1];
-
-  sprintf(input,"%s%s",mpriv->prompt,mpriv->cur_history->buffer);
+  char *input = av_asprintf("%s%s",mpriv->prompt,mpriv->cur_history->buffer);
   add_line(mpriv,input);
+  av_freep(&input);
 
   if(mpriv->history == mpriv->cur_history) {
     if(mpriv->history_size >= mpriv->history_max) {

MPlayer-1.2.r38170.tar.xz/libmenu/menu_filesel.c -> MPlayer-1.2.r38304.tar.xz/libmenu/menu_filesel.c Changed

@@ -21,7 +21,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -143,12 +142,13 @@
 }
 
 static int mylstat(char *dir, char *file,struct stat* st) {
-  int l = strlen(dir) + strlen(file);
-  char s[l+2];
+  int res;
+  char *s = av_asprintf("%s/%s",dir,file);
+  int l = strlen(s);
   if (!strcmp("..", file)) {
     char *slash;
     l -= 3;
-    strcpy(s, dir);
+    s[l+1] = 0;
 #if HAVE_DOS_PATHS
     if (s[l] == '/' || s[l] == '\\')
 #else
@@ -160,13 +160,12 @@
     if (!slash)
       slash = strrchr(s,'\\');
 #endif
-    if (!slash)
-      return stat(dir,st);
-    slash[1] = '\0';
-    return stat(s,st);
+    if (slash)
+      slash[1] = '\0';
   }
-  sprintf(s,"%s/%s",dir,file);
-  return stat(s,st);
+  res = stat(s,st);
+  av_freep(&s);
+  return res;
 }
 
 static int compare(const void *av, const void *bv){
@@ -283,7 +282,7 @@
       ext++;
       elem = extensions;
       do {
-        if (!strcasecmp(ext, *elem))
+        if (!av_strcasecmp(ext, *elem))
           break;
       } while (*++elem);
       if (*elem == NULL)
@@ -374,26 +373,22 @@
 	}
 	free(p);
     } else { // File and directory dealt with action string.
-      int fname_len = strlen(mpriv->dir) + strlen(mpriv->p.current->p.txt) + 1;
-      char filename[fname_len];
-      char *str;
       char *action = mpriv->p.current->d ? mpriv->dir_action:mpriv->file_action;
-      sprintf(filename,"%s%s",mpriv->dir,mpriv->p.current->p.txt);
-      str = replace_path(action, filename,1);
+      char *filename = av_asprintf("%s%s",mpriv->dir,mpriv->p.current->p.txt);
+      char *str = replace_path(action, filename,1);
       mp_input_parse_and_queue_cmds(str);
       if (str != action)
 	free(str);
+      av_freep(&filename);
     }
   } break;
   case MENU_CMD_ACTION: {
-    int fname_len = strlen(mpriv->dir) + strlen(mpriv->p.current->p.txt) + 1;
-    char filename[fname_len];
-    char *str;
-    sprintf(filename,"%s%s",mpriv->dir,mpriv->p.current->p.txt);
-    str = replace_path(action, filename,1);
+    char *filename = av_asprintf("%s%s",mpriv->dir,mpriv->p.current->p.txt);
+    char *str = replace_path(action, filename,1);
     mp_input_parse_and_queue_cmds(str);
     if(str != action)
       free(str);
+    av_freep(&filename);
   } break;
   default:
     menu_list_read_cmd(menu,cmd);

MPlayer-1.2.r38170.tar.xz/libmenu/menu_param.c -> MPlayer-1.2.r38304.tar.xz/libmenu/menu_param.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/ad_ffmpeg.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/ad_ffmpeg.c Changed

@@ -310,34 +310,41 @@
 
 static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
 {
+    int draining_started = 0;
     unsigned char *start=NULL;
-    int y,len=-1, got_frame;
+    int y,len=-1;
     AVFrame *frame = av_frame_alloc();
 
     if (!frame)
         return AVERROR(ENOMEM);
 
     while(len<minlen){
-	AVPacket pkt;
 	int len2=maxlen;
+	y = avcodec_receive_frame(sh_audio->context, frame);
+	if (y == AVERROR(EAGAIN) || y == AVERROR_EOF) {
+	AVPacket pkt;
 	double pts;
 	int x=ds_get_packet_pts(sh_audio->ds,&start, &pts);
 	if(x<=0) {
 	    start = NULL;
 	    x = 0;
 	    ds_parse(sh_audio->ds, &start, &x, MP_NOPTS_VALUE, 0);
-	    if (x <= 0)
-	        break; // error
 	} else {
 	    int in_size = x;
 	    int consumed = ds_parse(sh_audio->ds, &start, &x, pts, 0);
 	    sh_audio->ds->buffer_pos -= in_size - consumed;
-	    // Note: hopefully below is correct, it was only
+	    // Note: hopefully the following x <= 0 handling is correct, it was only
 	    // added because FFmpeg broke the API and 0-sized
 	    // packets started to break e.g. AC3 decode.
-	    if (x <= 0)
-	        break; // error or not enough data
 	}
+	    if (x <= 0) {
+	        if (sh_audio->ds->eof && !draining_started) {
+	            avcodec_send_packet(sh_audio->context, NULL);
+	            draining_started = 1;
+	            continue;
+	        }
+	        break; // error or not enough data
+	    }
 
 	av_init_packet(&pkt);
 	pkt.data = start;
@@ -346,16 +353,18 @@
 	    sh_audio->pts = pts;
 	    sh_audio->pts_bytes = 0;
 	}
-	y=avcodec_decode_audio4(sh_audio->context, frame, &got_frame, &pkt);
-//printf("return:%d samples_out:%d bitstream_in:%d sample_sum:%d\n", y, len2, x, len); fflush(stdout);
-	// LATM may need many packets to find mux info
-	if (y == AVERROR(EAGAIN))
-	    continue;
+	y=avcodec_send_packet(sh_audio->context, &pkt);
 	if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; }
+	continue;
+	}
+	if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; }
+//printf("return:%d samples_out:%d bitstream_in:%d sample_sum:%d\n", y, len2, x, len); fflush(stdout);
+#if 0
+	// this should be obsolete since the new API does no support it
+	// and we support inserting parsers as necessary instead.
 	if(!sh_audio->parser && y<x)
 	    sh_audio->ds->buffer_pos+=y-x;  // put back data (HACK!)
-        if (!got_frame)
-            continue;
+#endif
         len2 = copy_samples(sh_audio->context, frame, buf, maxlen);
         if (len2 < 0)
             return len2;

MPlayer-1.2.r38170.tar.xz/libmpcodecs/ad_hwmpa.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/ad_hwmpa.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/ad_libvorbis.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/ad_libvorbis.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/ad_realaud.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/ad_realaud.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/ad_spdif.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/ad_spdif.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/ae_toolame.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/ae_toolame.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/ae_twolame.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/ae_twolame.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/dec_video.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/dec_video.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vd_ffmpeg.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vd_ffmpeg.c Changed

@@ -18,7 +18,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <strings.h>
 #include <assert.h>
 #include <time.h>
 
@@ -29,6 +28,7 @@
 #include "av_helpers.h"
 
 #include "libavutil/common.h"
+#include "libavutil/avstring.h"
 #include "libavutil/dict.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
@@ -163,12 +163,12 @@
 
 static enum AVDiscard str2AVDiscard(char *str) {
     if (!str)                               return AVDISCARD_DEFAULT;
-    if (strcasecmp(str, "none"   ) == 0)    return AVDISCARD_NONE;
-    if (strcasecmp(str, "default") == 0)    return AVDISCARD_DEFAULT;
-    if (strcasecmp(str, "nonref" ) == 0)    return AVDISCARD_NONREF;
-    if (strcasecmp(str, "bidir"  ) == 0)    return AVDISCARD_BIDIR;
-    if (strcasecmp(str, "nonkey" ) == 0)    return AVDISCARD_NONKEY;
-    if (strcasecmp(str, "all"    ) == 0)    return AVDISCARD_ALL;
+    if (av_strcasecmp(str, "none"   ) == 0) return AVDISCARD_NONE;
+    if (av_strcasecmp(str, "default") == 0) return AVDISCARD_DEFAULT;
+    if (av_strcasecmp(str, "nonref" ) == 0) return AVDISCARD_NONREF;
+    if (av_strcasecmp(str, "bidir"  ) == 0) return AVDISCARD_BIDIR;
+    if (av_strcasecmp(str, "nonkey" ) == 0) return AVDISCARD_NONKEY;
+    if (av_strcasecmp(str, "all"    ) == 0) return AVDISCARD_ALL;
     mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Unknown discard value %s\n", str);
     return AVDISCARD_DEFAULT;
 }
@@ -484,7 +484,7 @@
     set_dr_slice_settings(avctx, lavc_codec);
     avctx->thread_count = lavc_param_threads;
     avctx->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE;
-    avctx->refcounted_frames = 1;
+    av_dict_set(&opts, "refcounted_frames", "1", 0);
 
     /* open it */
     if (avcodec_open2(avctx, lavc_codec, &opts) < 0) {
@@ -925,7 +925,18 @@
         }
         ctx->palette_sent = 1;
     }
-    ret = avcodec_decode_video2(avctx, pic, &got_picture, &pkt);
+    if (sh->ds->buffer_pos < len)
+        mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Bad stream state, please report as bug!\n");
+    ret = avcodec_send_packet(avctx, !pkt.data && !pkt.size ? NULL : &pkt);
+    if (ret == AVERROR(EAGAIN)) {
+        if (sh->ds->buffer_pos >= len) sh->ds->buffer_pos -= len;
+        ret = 0;
+    }
+    if (ret >= 0 || ret == AVERROR_EOF) {
+        ret = avcodec_receive_frame(avctx, pic);
+        got_picture = ret >= 0;
+        if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) ret = 0;
+    }
     ctx->refcount_frame = pic;
     pkt.data = NULL;
     pkt.size = 0;
@@ -935,7 +946,7 @@
     // FFmpeg allocate - this mostly happens with nonref_dr.
     // Ensure we treat it correctly.
     dr1= ctx->do_dr1 && pic->opaque != NULL;
-    if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n");
+    if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame! (%i)\n", ret);
 //printf("repeat: %d\n", pic->repeat_pict);
 //-- vstats generation
     while(lavc_param_vstats){ // always one time loop

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vd_zrmjpeg.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vd_zrmjpeg.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/ve_lavc.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/ve_lavc.c Changed

@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <math.h>
 #include <limits.h>
 #include <time.h>
@@ -32,6 +31,7 @@
 #endif
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "mencoder.h"
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -865,29 +865,29 @@
     /* XXX: hack: some of the MJPEG decoder DLL's needs exported huffman
        table, so we define a zero-table, also lavc mjpeg encoder is putting
        huffman tables into the stream, so no problem */
-    if (lavc_param_vcodec && !strcasecmp(lavc_param_vcodec, "mjpeg"))
+    if (lavc_param_vcodec && !av_strcasecmp(lavc_param_vcodec, "mjpeg"))
     {
 	mux_v->bih=calloc(1, sizeof(*mux_v->bih)+28);
 	mux_v->bih->biSize=sizeof(*mux_v->bih)+28;
     }
-    else if (lavc_param_vcodec && (!strcasecmp(lavc_param_vcodec, "huffyuv")
-                                || !strcasecmp(lavc_param_vcodec, "ffvhuff")))
+    else if (lavc_param_vcodec && (!av_strcasecmp(lavc_param_vcodec, "huffyuv")
+                                || !av_strcasecmp(lavc_param_vcodec, "ffvhuff")))
     {
     /* XXX: hack: huffyuv needs to store huffman tables (allthough we dunno the size yet ...) */
 	mux_v->bih=calloc(1, sizeof(*mux_v->bih)+1000);
 	mux_v->bih->biSize=sizeof(*mux_v->bih)+1000;
     }
-    else if (lavc_param_vcodec && !strcasecmp(lavc_param_vcodec, "asv1"))
+    else if (lavc_param_vcodec && !av_strcasecmp(lavc_param_vcodec, "asv1"))
     {
 	mux_v->bih=calloc(1, sizeof(*mux_v->bih)+8);
 	mux_v->bih->biSize=sizeof(*mux_v->bih)+8;
     }
-    else if (lavc_param_vcodec && !strcasecmp(lavc_param_vcodec, "asv2"))
+    else if (lavc_param_vcodec && !av_strcasecmp(lavc_param_vcodec, "asv2"))
     {
 	mux_v->bih=calloc(1, sizeof(*mux_v->bih)+8);
 	mux_v->bih->biSize=sizeof(*mux_v->bih)+8;
     }
-    else if (lavc_param_vcodec && !strcasecmp(lavc_param_vcodec, "wmv2"))
+    else if (lavc_param_vcodec && !av_strcasecmp(lavc_param_vcodec, "wmv2"))
     {
 	mux_v->bih=calloc(1, sizeof(*mux_v->bih)+4);
 	mux_v->bih->biSize=sizeof(*mux_v->bih)+4;
@@ -907,51 +907,51 @@
 	return 0;
     }
 
-    if (!strcasecmp(lavc_param_vcodec, "mpeg1") || !strcasecmp(lavc_param_vcodec, "mpeg1video"))
+    if (!av_strcasecmp(lavc_param_vcodec, "mpeg1") || !av_strcasecmp(lavc_param_vcodec, "mpeg1video"))
 	mux_v->bih->biCompression = mmioFOURCC('m', 'p', 'g', '1');
-    else if (!strcasecmp(lavc_param_vcodec, "mpeg2") || !strcasecmp(lavc_param_vcodec, "mpeg2video"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "mpeg2") || !av_strcasecmp(lavc_param_vcodec, "mpeg2video"))
 	mux_v->bih->biCompression = mmioFOURCC('m', 'p', 'g', '2');
-    else if (!strcasecmp(lavc_param_vcodec, "h263") || !strcasecmp(lavc_param_vcodec, "h263p"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "h263") || !av_strcasecmp(lavc_param_vcodec, "h263p"))
 	mux_v->bih->biCompression = mmioFOURCC('h', '2', '6', '3');
-    else if (!strcasecmp(lavc_param_vcodec, "rv10"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "rv10"))
 	mux_v->bih->biCompression = mmioFOURCC('R', 'V', '1', '0');
-    else if (!strcasecmp(lavc_param_vcodec, "mjpeg"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "mjpeg"))
 	mux_v->bih->biCompression = mmioFOURCC('M', 'J', 'P', 'G');
-    else if (!strcasecmp(lavc_param_vcodec, "ljpeg"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "ljpeg"))
 	mux_v->bih->biCompression = mmioFOURCC('L', 'J', 'P', 'G');
-    else if (!strcasecmp(lavc_param_vcodec, "mpeg4"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "mpeg4"))
 	mux_v->bih->biCompression = mmioFOURCC('F', 'M', 'P', '4');
-    else if (!strcasecmp(lavc_param_vcodec, "msmpeg4"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "msmpeg4"))
 	mux_v->bih->biCompression = mmioFOURCC('d', 'i', 'v', '3');
-    else if (!strcasecmp(lavc_param_vcodec, "msmpeg4v2"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "msmpeg4v2"))
 	mux_v->bih->biCompression = mmioFOURCC('M', 'P', '4', '2');
-    else if (!strcasecmp(lavc_param_vcodec, "wmv1"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "wmv1"))
 	mux_v->bih->biCompression = mmioFOURCC('W', 'M', 'V', '1');
-    else if (!strcasecmp(lavc_param_vcodec, "wmv2"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "wmv2"))
 	mux_v->bih->biCompression = mmioFOURCC('W', 'M', 'V', '2');
-    else if (!strcasecmp(lavc_param_vcodec, "huffyuv"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "huffyuv"))
 	mux_v->bih->biCompression = mmioFOURCC('H', 'F', 'Y', 'U');
-    else if (!strcasecmp(lavc_param_vcodec, "ffvhuff"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "ffvhuff"))
 	mux_v->bih->biCompression = mmioFOURCC('F', 'F', 'V', 'H');
-    else if (!strcasecmp(lavc_param_vcodec, "asv1"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "asv1"))
 	mux_v->bih->biCompression = mmioFOURCC('A', 'S', 'V', '1');
-    else if (!strcasecmp(lavc_param_vcodec, "asv2"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "asv2"))
 	mux_v->bih->biCompression = mmioFOURCC('A', 'S', 'V', '2');
-    else if (!strcasecmp(lavc_param_vcodec, "ffv1"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "ffv1"))
 	mux_v->bih->biCompression = mmioFOURCC('F', 'F', 'V', '1');
-    else if (!strcasecmp(lavc_param_vcodec, "snow"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "snow"))
 	mux_v->bih->biCompression = mmioFOURCC('S', 'N', 'O', 'W');
-    else if (!strcasecmp(lavc_param_vcodec, "flv"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "flv"))
 	mux_v->bih->biCompression = mmioFOURCC('F', 'L', 'V', '1');
-    else if (!strcasecmp(lavc_param_vcodec, "dvvideo"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "dvvideo"))
 	mux_v->bih->biCompression = mmioFOURCC('d', 'v', 's', 'd');
-    else if (!strcasecmp(lavc_param_vcodec, "libx264"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "libx264"))
 	mux_v->bih->biCompression = mmioFOURCC('h', '2', '6', '4');
-    else if (!strcasecmp(lavc_param_vcodec, "libschroedinger"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "libschroedinger"))
 	mux_v->bih->biCompression = mmioFOURCC('d', 'r', 'a', 'c');
-    else if (!strcasecmp(lavc_param_vcodec, "libdirac"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "libdirac"))
 	mux_v->bih->biCompression = mmioFOURCC('d', 'r', 'a', 'c');
-    else if (!strcasecmp(lavc_param_vcodec, "libvpx"))
+    else if (!av_strcasecmp(lavc_param_vcodec, "libvpx"))
 	mux_v->bih->biCompression = mmioFOURCC('V', 'P', '8', '0');
     else
 	mux_v->bih->biCompression = mmioFOURCC(lavc_param_vcodec[0],

MPlayer-1.2.r38170.tar.xz/libmpcodecs/ve_x264.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/ve_x264.c Changed

@@ -30,10 +30,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "mp_msg.h"
 #include "mencoder.h"
 #include "m_option.h"
@@ -91,9 +91,9 @@
         if (!value)
             continue;
         *value++ = 0;
-        if (!strcasecmp(name, "preset"))
+        if (!av_strcasecmp(name, "preset"))
             preset = value;
-        else if (!strcasecmp(name, "tune"))
+        else if (!av_strcasecmp(name, "tune"))
             tune = value;
     }
     if (x264_param_default_preset(&param, preset, tune) < 0) {
@@ -109,16 +109,16 @@
 
         if (value)
             *value++ = 0;
-        if (!strcasecmp(name, "profile"))
+        if (!av_strcasecmp(name, "profile"))
             profile = value;
-        else if (!strcasecmp(name, "turbo")) {
+        else if (!av_strcasecmp(name, "turbo")) {
             mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option x264encopts: turbo option is deprecated; "
                                               "use slow_firstpass to disable turbo\n");
             if (value && *value == '0')
                 slow_firstpass = 1;
-        } else if (!strcasecmp(name, "slow_firstpass"))
+        } else if (!av_strcasecmp(name, "slow_firstpass"))
             slow_firstpass = 1;
-        else if (strcasecmp(name, "preset") && strcasecmp(name, "tune")) {
+        else if (av_strcasecmp(name, "preset") && av_strcasecmp(name, "tune")) {
             ret = x264_param_parse(&param, name, value);
             if (ret == X264_PARAM_BAD_NAME)
                 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Unknown suboption %s\n", name);

MPlayer-1.2.r38170.tar.xz/libmpcodecs/ve_xvid4.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/ve_xvid4.c Changed

@@ -28,13 +28,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
 #include <math.h>
 #include <limits.h>
 #include <time.h>
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "mp_msg.h"
 #include "mencoder.h"
 #include "codec-cfg.h"
@@ -150,7 +150,7 @@
 static const profile_t *profileFromName(const char *str)
 {
 	profile_t *cur = profiles;
-	while (cur->name && strcasecmp(cur->name, str)) cur++;
+	while (cur->name && av_strcasecmp(cur->name, str)) cur++;
 	if(!cur->name) return NULL;
 	return cur;
 }
@@ -851,7 +851,7 @@
 	// MPEG quantisation is only supported in ASP and unrestricted profiles
 	if((selected_profile->flags & PROFILE_MPEGQUANT) &&
 		(xvidenc_quant_method != NULL) &&
-		!strcasecmp(xvidenc_quant_method, "mpeg"))
+		!av_strcasecmp(xvidenc_quant_method, "mpeg"))
 	{
 		frame->vol_flags |= XVID_VOL_MPEGQUANT;
 	if(xvidenc_intra_matrix_file != NULL) {
@@ -965,15 +965,15 @@
 		}
 
 	} else if(xvidenc_par != NULL) {
-		if(strcasecmp(xvidenc_par, "pal43") == 0)
+		if(av_strcasecmp(xvidenc_par, "pal43") == 0)
 			frame->par = XVID_PAR_43_PAL;
-		else if(strcasecmp(xvidenc_par, "pal169") == 0)
+		else if(av_strcasecmp(xvidenc_par, "pal169") == 0)
 			frame->par = XVID_PAR_169_PAL;
-		else if(strcasecmp(xvidenc_par, "ntsc43") == 0)
+		else if(av_strcasecmp(xvidenc_par, "ntsc43") == 0)
 			frame->par = XVID_PAR_43_NTSC;
-		else if(strcasecmp(xvidenc_par, "ntsc169") == 0)
+		else if(av_strcasecmp(xvidenc_par, "ntsc169") == 0)
 			frame->par = XVID_PAR_169_NTSC;
-		else if(strcasecmp(xvidenc_par, "ext") == 0)
+		else if(av_strcasecmp(xvidenc_par, "ext") == 0)
 			frame->par = XVID_PAR_EXT;
 
 	if(frame->par == XVID_PAR_EXT) {

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_filmdint.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_filmdint.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_fspp.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_fspp.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_gradfun.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_gradfun.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_ow.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_ow.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_palette.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_palette.c Changed

@@ -19,10 +19,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <inttypes.h>
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 
@@ -197,14 +197,14 @@
     for(i=0;i<256;i++) gray_pal[i]=0x01010101*i;
     if (args)
     {
-        if (!strcasecmp(args,"rgb15")) vf->priv->fmt=IMGFMT_RGB15; else
-        if (!strcasecmp(args,"rgb16")) vf->priv->fmt=IMGFMT_RGB16; else
-        if (!strcasecmp(args,"rgb24")) vf->priv->fmt=IMGFMT_RGB24; else
-        if (!strcasecmp(args,"rgb32")) vf->priv->fmt=IMGFMT_RGB32; else
-        if (!strcasecmp(args,"bgr15")) vf->priv->fmt=IMGFMT_BGR15; else
-        if (!strcasecmp(args,"bgr16")) vf->priv->fmt=IMGFMT_BGR16; else
-        if (!strcasecmp(args,"bgr24")) vf->priv->fmt=IMGFMT_BGR24; else
-        if (!strcasecmp(args,"bgr32")) vf->priv->fmt=IMGFMT_BGR32; else
+        if (!av_strcasecmp(args,"rgb15")) vf->priv->fmt=IMGFMT_RGB15; else
+        if (!av_strcasecmp(args,"rgb16")) vf->priv->fmt=IMGFMT_RGB16; else
+        if (!av_strcasecmp(args,"rgb24")) vf->priv->fmt=IMGFMT_RGB24; else
+        if (!av_strcasecmp(args,"rgb32")) vf->priv->fmt=IMGFMT_RGB32; else
+        if (!av_strcasecmp(args,"bgr15")) vf->priv->fmt=IMGFMT_BGR15; else
+        if (!av_strcasecmp(args,"bgr16")) vf->priv->fmt=IMGFMT_BGR16; else
+        if (!av_strcasecmp(args,"bgr24")) vf->priv->fmt=IMGFMT_BGR24; else
+        if (!av_strcasecmp(args,"bgr32")) vf->priv->fmt=IMGFMT_BGR32; else
         {
             mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_UnknownFormatName, args);
             return 0;

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_pp7.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_pp7.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_scale.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_scale.c Changed

@@ -32,9 +32,11 @@
 #include "fmt-conversion.h"
 #include "mpbswap.h"
 
+#include "libavutil/opt.h"
 #include "libswscale/swscale.h"
 #include "vf_scale.h"
 
+#include "av_opts.h"
 #include "m_option.h"
 #include "m_struct.h"
 
@@ -588,6 +590,7 @@
 
 //global sws_flags from the command line
 int sws_flags=2;
+char *sws_opts;
 
 //global srcFilter
 static SwsFilter *src_filter= NULL;
@@ -648,6 +651,7 @@
 {
         int flags;
         SwsFilter *dstFilterParam, *srcFilterParam;
+        struct SwsContext *ctx;
         enum AVPixelFormat dfmt, sfmt;
 
         dfmt = imgfmt2pixfmt(dstFormat);
@@ -655,7 +659,26 @@
         if (srcFormat == IMGFMT_RGB8 || srcFormat == IMGFMT_BGR8) sfmt = AV_PIX_FMT_PAL8;
         sws_getFlagsAndFilterFromCmdLine(&flags, &srcFilterParam, &dstFilterParam);
 
-        return sws_getContext(srcW, srcH, sfmt, dstW, dstH, dfmt, flags, srcFilterParam, dstFilterParam, NULL);
+        ctx = sws_alloc_context();
+        if (!ctx) return NULL;
+        // set it first to allow swsopts to override/add to it
+        av_opt_set_int(ctx, "sws_flags", flags, 0);
+        if (parse_avopts(ctx, sws_opts) < 0) {
+            mp_msg(MSGT_VFILTER, MSGL_ERR, "Your options /%s/ look like gibberish to me pal.\n", sws_opts);
+            return NULL;
+        }
+        // always override these
+        av_opt_set_int(ctx, "srcw", srcW, 0);
+        av_opt_set_int(ctx, "srch", srcH, 0);
+        av_opt_set_int(ctx, "src_format", sfmt, 0);
+        av_opt_set_int(ctx, "dstw", dstW, 0);
+        av_opt_set_int(ctx, "dsth", dstH, 0);
+        av_opt_set_int(ctx, "dst_format", dfmt, 0);
+        if (sws_init_context(ctx, srcFilterParam, dstFilterParam) < 0) {
+            sws_freeContext(ctx);
+            return NULL;
+        }
+        return ctx;
 }
 
 /// An example of presets usage

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_scale.h -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_scale.h Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_spp.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_spp.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_uspp.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_uspp.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_yadif.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_yadif.c Changed

MPlayer-1.2.r38170.tar.xz/libmpcodecs/vf_zrmjpeg.c -> MPlayer-1.2.r38304.tar.xz/libmpcodecs/vf_zrmjpeg.c Changed

@@ -36,10 +36,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <inttypes.h>
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "av_helpers.h"
 #include "mp_msg.h"
 #include "img_format.h"
@@ -54,7 +54,7 @@
 
 #undef malloc
 #undef free
-#undef strcasecmp
+#undef av_strcasecmp
 
 /* some convenient #define's, is this portable enough? */
 /// Printout  with vf_zrmjpeg: prefix at VERBOSE level
@@ -993,35 +993,35 @@
 					VERBOSE(
 			"setting vertical decimation to %d\n", priv->maxwidth);
 				}
-			} else if (!strcasecmp("dc10+-PAL", ptr) ||
-					!strcasecmp("dc10-PAL", ptr)) {
+			} else if (!av_strcasecmp("dc10+-PAL", ptr) ||
+					!av_strcasecmp("dc10-PAL", ptr)) {
 				priv->maxwidth = 768;
 				priv->maxheight = 576;
 				VERBOSE("setting DC10(+) PAL profile\n");
-			} else if (!strcasecmp("fd", ptr)) {
+			} else if (!av_strcasecmp("fd", ptr)) {
 				priv->fd = 1;
 				VERBOSE("forcing decimation\n");
-			} else if (!strcasecmp("nofd", ptr)) {
+			} else if (!av_strcasecmp("nofd", ptr)) {
 				priv->fd = 0;
 				VERBOSE("decimate only if beautiful\n");
-			} else if (!strcasecmp("bw", ptr)) {
+			} else if (!av_strcasecmp("bw", ptr)) {
 				priv->bw = 1;
 				VERBOSE("setting black and white encoding\n");
-			} else if (!strcasecmp("color", ptr)) {
+			} else if (!av_strcasecmp("color", ptr)) {
 				priv->bw = 0;
 				VERBOSE("setting color encoding\n");
-			} else if (!strcasecmp("dc10+-NTSC", ptr) ||
-					!strcasecmp("dc10-NTSC", ptr)) {
+			} else if (!av_strcasecmp("dc10+-NTSC", ptr) ||
+					!av_strcasecmp("dc10-NTSC", ptr)) {
 				priv->maxwidth = 640;
 				priv->maxheight = 480;
 				VERBOSE("setting DC10(+) NTSC profile\n");
-			} else if (!strcasecmp("buz-PAL", ptr) ||
-					!strcasecmp("lml33-PAL", ptr)) {
+			} else if (!av_strcasecmp("buz-PAL", ptr) ||
+					!av_strcasecmp("lml33-PAL", ptr)) {
 				priv->maxwidth = 720;
 				priv->maxheight = 576;
 				VERBOSE("setting buz/lml33 PAL profile\n");
-			} else if (!strcasecmp("buz-NTSC", ptr) ||
-					!strcasecmp("lml33-NTSC", ptr)) {
+			} else if (!av_strcasecmp("buz-NTSC", ptr) ||
+					!av_strcasecmp("lml33-NTSC", ptr)) {
 				priv->maxwidth = 720;
 				priv->maxheight = 480;
 				VERBOSE("setting buz/lml33 NTSC profile\n");

MPlayer-1.2.r38170.tar.xz/libmpdemux/asf.h -> MPlayer-1.2.r38304.tar.xz/libmpdemux/asf.h Changed

@@ -23,29 +23,35 @@
 #include <inttypes.h>
 #include "libavutil/common.h"
 #include "mpbswap.h"
+#include "mppacked.h"
 
 ///////////////////////
 // ASF Object Header
 ///////////////////////
-typedef struct __attribute__((packed)) {
+MP_PACKED(
+typedef struct, {
   uint8_t guid[16];
   uint64_t size;
 } ASF_obj_header_t;
+)
 
 ////////////////
 // ASF Header
 ////////////////
-typedef struct __attribute__((packed)) {
+MP_PACKED(
+typedef struct, {
   ASF_obj_header_t objh;
   uint32_t cno; // number of subchunks
   uint8_t v1; // unknown (0x01)
   uint8_t v2; // unknown (0x02)
 } ASF_header_t;
+)
 
 /////////////////////
 // ASF File Header
 /////////////////////
-typedef struct __attribute__((packed)) {
+MP_PACKED(
+typedef struct, {
   uint8_t stream_id[16]; // stream GUID
   uint64_t file_size;
   uint64_t creation_time; //File creation time FILETIME 8
@@ -58,11 +64,13 @@
   uint32_t max_packet_size; //Max size of the packet  UINT32 4
   uint32_t max_bitrate; //Maximum bitrate of the media (sum of all the stream)
 } ASF_file_header_t;
+)
 
 ///////////////////////
 // ASF Stream Header
 ///////////////////////
-typedef struct __attribute__((packed)) {
+MP_PACKED(
+typedef struct, {
   uint8_t type[16]; // Stream type (audio/video) GUID 16
   uint8_t concealment[16]; // Audio error concealment type GUID 16
   uint64_t unk1; // Unknown, maybe reserved ( usually contains 0 ) UINT64 8
@@ -71,38 +79,45 @@
   uint16_t stream_no; //Stream number UINT16 2
   uint32_t unk2; //Unknown UINT32 4
 } ASF_stream_header_t;
+)
 
 ///////////////////////////
 // ASF Content Description
 ///////////////////////////
-typedef struct  __attribute__((packed)) {
+MP_PACKED(
+typedef struct, {
   uint16_t title_size;
   uint16_t author_size;
   uint16_t copyright_size;
   uint16_t comment_size;
   uint16_t rating_size;
 } ASF_content_description_t;
+)
 
 ////////////////////////
 // ASF Segment Header
 ////////////////////////
-typedef struct __attribute__((packed)) {
+MP_PACKED(
+typedef struct, {
   uint8_t streamno;
   uint8_t seq;
   uint32_t x;
   uint8_t flag;
 } ASF_segmhdr_t;
+)
 
 //////////////////////
 // ASF Stream Chunck
 //////////////////////
-typedef struct __attribute__((packed)) {
+MP_PACKED(
+typedef struct, {
 	uint16_t	type;
 	uint16_t	size;
 	uint32_t	sequence_number;
 	uint16_t	unknown;
 	uint16_t	size_confirm;
 } ASF_stream_chunck_t;
+)
 
 // Definition of the stream type
 #if HAVE_BIGENDIAN

MPlayer-1.2.r38170.tar.xz/libmpdemux/asfheader.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/asfheader.c Changed

@@ -437,7 +437,9 @@
       audio_pos = pos - 16 - 8;
       streamh = (ASF_stream_header_t *)&hdr[sh_pos];
       le2me_ASF_stream_header_t(streamh);
+      if (streamh->type_size > hdr_len) goto len_err_out;
       audio_pos += 64; //16+16+4+4+4+16+4;
+      if (audio_pos + streamh->type_size > hdr_len) goto len_err_out;
       buffer = &hdr[audio_pos];
       sh_audio=new_sh_audio(demuxer,streamh->stream_no & 0x7F, NULL);
       sh_audio->needs_parsing = 1;
@@ -461,6 +463,7 @@
     pos += sizeof(ASF_stream_header_t);
     if (pos > hdr_len) goto len_err_out;
     le2me_ASF_stream_header_t(streamh);
+    if (streamh->type_size > hdr_len) goto len_err_out;
     mp_msg(MSGT_HEADER, MSGL_V, "stream type: %s\n",
             asf_chunk_type(streamh->type));
     mp_msg(MSGT_HEADER, MSGL_V, "stream concealment: %s\n",
@@ -491,6 +494,7 @@
         sh_video_t* sh_video=new_sh_video(demuxer,streamh->stream_no & 0x7F);
         mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "asfheader", streamh->stream_no & 0x7F);
         len=streamh->type_size-(4+4+1+2);
+        if (len > streamh->type_size) goto len_err_out;
 	++video_streams;
 //        sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize);
         sh_video->bih=calloc((len<sizeof(*sh_video->bih))?sizeof(*sh_video->bih):len,1);

MPlayer-1.2.r38170.tar.xz/libmpdemux/aviheader.h -> MPlayer-1.2.r38304.tar.xz/libmpdemux/aviheader.h Changed

MPlayer-1.2.r38170.tar.xz/libmpdemux/demux_audio.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/demux_audio.c Changed

@@ -33,7 +33,6 @@
 #include "libavutil/intreadwrite.h"
 
 #include <string.h>
-#include <strings.h>
 
 #define MP3 1
 #define WAV 2
@@ -220,19 +219,19 @@
           c = comment[length];
           comment[length] = 0;
 
-          if (!strncasecmp ("TITLE=", comment, 6) && (length - 6 > 0))
+          if (!av_strncasecmp ("TITLE=", comment, 6) && (length - 6 > 0))
             demux_info_add (demuxer, "Title", comment + 6);
-          else if (!strncasecmp ("ARTIST=", comment, 7) && (length - 7 > 0))
+          else if (!av_strncasecmp ("ARTIST=", comment, 7) && (length - 7 > 0))
             demux_info_add (demuxer, "Artist", comment + 7);
-          else if (!strncasecmp ("ALBUM=", comment, 6) && (length - 6 > 0))
+          else if (!av_strncasecmp ("ALBUM=", comment, 6) && (length - 6 > 0))
             demux_info_add (demuxer, "Album", comment + 6);
-          else if (!strncasecmp ("DATE=", comment, 5) && (length - 5 > 0))
+          else if (!av_strncasecmp ("DATE=", comment, 5) && (length - 5 > 0))
             demux_info_add (demuxer, "Year", comment + 5);
-          else if (!strncasecmp ("GENRE=", comment, 6) && (length - 6 > 0))
+          else if (!av_strncasecmp ("GENRE=", comment, 6) && (length - 6 > 0))
             demux_info_add (demuxer, "Genre", comment + 6);
-          else if (!strncasecmp ("Comment=", comment, 8) && (length - 8 > 0))
+          else if (!av_strncasecmp ("Comment=", comment, 8) && (length - 8 > 0))
             demux_info_add (demuxer, "Comment", comment + 8);
-          else if (!strncasecmp ("TRACKNUMBER=", comment, 12)
+          else if (!av_strncasecmp ("TRACKNUMBER=", comment, 12)
                    && (length - 12 > 0))
           {
             char buf[31];

MPlayer-1.2.r38170.tar.xz/libmpdemux/demux_film.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/demux_film.c Changed

MPlayer-1.2.r38170.tar.xz/libmpdemux/demux_lavf.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/demux_lavf.c Changed

@@ -146,9 +146,10 @@
 }
 
 static void list_formats(void) {
-    AVInputFormat *fmt;
+    void *i = 0;
+    const AVInputFormat *fmt;
     mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf input formats:\n");
-    for (fmt = av_iformat_next(NULL); fmt; fmt = av_iformat_next(fmt))
+    while ((fmt = av_demuxer_iterate(&i)))
         mp_msg(MSGT_DEMUX, MSGL_INFO, "%15s : %s\n", fmt->name, fmt->long_name);
 }
 
@@ -288,7 +289,7 @@
 static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) {
     lavf_priv_t *priv= demuxer->priv;
     AVStream *st= avfc->streams[i];
-    AVCodecContext *codec= st->codec;
+    AVCodecParameters *codec= st->codecpar;
     char *stream_type = NULL;
     int stream_id;
     AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0);
@@ -396,7 +397,7 @@
                 if (codec->bits_per_coded_sample && codec->bits_per_coded_sample > 0 &&
                     codec->codec_tag == MKTAG('r', 'a', 'w', 32))
                     codec->codec_tag = 0;
-                switch (codec->pix_fmt) {
+                switch (codec->format) {
                     case AV_PIX_FMT_RGB24:
                         codec->codec_tag= MKTAG(24, 'B', 'G', 'R');
                         break;
@@ -420,8 +421,8 @@
                 sh_video->video.dwRate= st->time_base.den;
                 sh_video->video.dwScale= st->time_base.num;
             } else {
-                sh_video->video.dwRate= codec->time_base.den;
-                sh_video->video.dwScale= codec->time_base.num;
+                sh_video->video.dwRate= st->codec->time_base.den;
+                sh_video->video.dwScale= st->codec->time_base.num;
             }
             sh_video->fps=av_q2d(st->r_frame_rate);
             sh_video->frametime=1/av_q2d(st->r_frame_rate);
@@ -513,7 +514,7 @@
             break;
         }
         case AVMEDIA_TYPE_ATTACHMENT:{
-            if (st->codec->codec_id == AV_CODEC_ID_TTF || st->codec->codec_id == AV_CODEC_ID_OTF) {
+            if (st->codecpar->codec_id == AV_CODEC_ID_TTF || st->codecpar->codec_id == AV_CODEC_ID_OTF) {
                 AVDictionaryEntry *fnametag = av_dict_get(st->metadata, "filename", NULL, 0);
                 AVDictionaryEntry *mimetype = av_dict_get(st->metadata, "mimetype", NULL, 0);
                 demuxer_add_attachment(demuxer, fnametag ? fnametag->value : NULL,
@@ -716,23 +717,19 @@
         ds=demux->sub;
         sub_utf8=1;
     } else {
-        av_free_packet(&pkt);
+        av_packet_unref(&pkt);
         return 1;
     }
 
         av_packet_merge_side_data(&pkt);
         dp=new_demux_packet(pkt.size);
         memcpy(dp->buffer, pkt.data, pkt.size);
-        av_free_packet(&pkt);
 
     if(pkt.pts != AV_NOPTS_VALUE){
         dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base);
         priv->last_pts= dp->pts * AV_TIME_BASE;
         if(pkt.duration > 0)
             dp->endpts = dp->pts + pkt.duration * av_q2d(priv->avfc->streams[id]->time_base);
-        /* subtitle durations are sometimes stored in convergence_duration */
-        if(ds == demux->sub && pkt.convergence_duration > 0)
-            dp->endpts = dp->pts + pkt.convergence_duration * av_q2d(priv->avfc->streams[id]->time_base);
     }
     dp->pos=demux->filepos;
     dp->flags= !!(pkt.flags&AV_PKT_FLAG_KEY);
@@ -741,6 +738,7 @@
         dp->stream_pts = stream_pts;
     // append packet to DS stream:
     ds_add_packet(ds,dp);
+    av_packet_unref(&pkt);
     return 1;
 }
 
@@ -879,7 +877,7 @@
             program = priv->avfc->programs[p];
             for(i=0; i<program->nb_stream_indexes; i++)
             {
-                switch(priv->avfc->streams[program->stream_index[i]]->codec->codec_type)
+                switch(priv->avfc->streams[program->stream_index[i]]->codecpar->codec_type)
                 {
                     case AVMEDIA_TYPE_VIDEO:
                         if(prog->vid == -2)

MPlayer-1.2.r38170.tar.xz/libmpdemux/demux_mf.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/demux_mf.c Changed

MPlayer-1.2.r38170.tar.xz/libmpdemux/demux_mov.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/demux_mov.c Changed

MPlayer-1.2.r38170.tar.xz/libmpdemux/demux_ogg.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/demux_ogg.c Changed

@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>
 #include <assert.h>
 #include <math.h>
 #include <inttypes.h>
@@ -29,9 +28,11 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "mpcommon.h"
+#include "mppacked.h"
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
+#include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "aviprint.h"
 #include "demux_mov.h"
@@ -81,7 +82,8 @@
     ogg_int32_t avgbytespersec;
 } stream_header_audio;
 
-typedef struct __attribute__((__packed__)) stream_header {
+MP_PACKED(
+typedef struct, stream_header {
     char streamtype[8];
     char subtype[4];
 
@@ -103,6 +105,7 @@
         stream_header_audio	audio;
     } sh;
 } stream_header;
+)
 
 /// Our private datas
 
@@ -355,11 +358,11 @@
     if (!langlist || !*langlist)
         return 0;
     while ((c = strchr(langlist, ','))) {
-        if (!strncasecmp(clang, langlist, c - langlist))
+        if (!av_strncasecmp(clang, langlist, c - langlist))
             return 1;
         langlist = &c[1];
     }
-    if (!strncasecmp(clang, langlist, strlen(langlist)))
+    if (!av_strncasecmp(clang, langlist, strlen(langlist)))
         return 1;
     return 0;
 }
@@ -420,7 +423,7 @@
 
     while (*cmt) {
         hdr = NULL;
-        if (!strncasecmp(*cmt, "LANGUAGE=", 9)) {
+        if (!av_strncasecmp(*cmt, "LANGUAGE=", 9)) {
             val = *cmt + 9;
             if (ogg_d->subs[id].text)
                 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n",
@@ -459,7 +462,7 @@
         }
         else {
             for (i = 0; table[i].ogg; i++) {
-                if (!strncasecmp(*cmt, table[i].ogg, strlen(table[i].ogg)) &&
+                if (!av_strncasecmp(*cmt, table[i].ogg, strlen(table[i].ogg)) &&
                         (*cmt)[strlen(table[i].ogg)] == '=') {
                     hdr = table[i].mp;
                     val = *cmt + strlen(table[i].ogg) + 1;

MPlayer-1.2.r38170.tar.xz/libmpdemux/demux_pva.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/demux_pva.c Changed

MPlayer-1.2.r38170.tar.xz/libmpdemux/demux_realaud.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/demux_realaud.c Changed

@@ -157,13 +157,25 @@
 }
 
 
+static void read_demux_info(demuxer_t *demuxer, const char *name)
+{
+	char *buf = NULL;
+	int len = stream_read_char(demuxer->stream);
+	if (len <= 0) return;
+	buf = malloc(len+1);
+	if (!buf) return;
+	if (stream_read(demuxer->stream, buf, len) != len) goto out;
+	buf[len] = 0;
+	demux_info_add(demuxer, name, buf);
+out:
+	free(buf);
+}
 
 static demuxer_t* demux_open_ra(demuxer_t* demuxer)
 {
 	ra_priv_t* ra_priv = demuxer->priv;
 	sh_audio_t *sh;
 	int i;
-	char *buf;
 
   if ((ra_priv = malloc(sizeof(ra_priv_t))) == NULL) {
     mp_msg(MSGT_DEMUX, MSGL_ERR, "[RealAudio] Can't allocate memory for private data.\n");
@@ -229,35 +241,10 @@
 		stream_skip(demuxer->stream, 3);
 	}
 
-	if ((i = stream_read_char(demuxer->stream)) != 0) {
-		buf = malloc(i+1);
-		stream_read(demuxer->stream, buf, i);
-		buf[i] = 0;
-		demux_info_add(demuxer, "Title", buf);
-		free(buf);
-	}
-	if ((i = stream_read_char(demuxer->stream)) != 0) {
-		buf = malloc(i+1);
-		stream_read(demuxer->stream, buf, i);
-		buf[i] = 0;
-		demux_info_add(demuxer, "Author", buf);
-		free(buf);
-	}
-	if ((i = stream_read_char(demuxer->stream)) != 0) {
-		buf = malloc(i+1);
-		stream_read(demuxer->stream, buf, i);
-		buf[i] = 0;
-		demux_info_add(demuxer, "Copyright", buf);
-		free(buf);
-	}
-
-	if ((i = stream_read_char(demuxer->stream)) != 0) {
-		buf = malloc(i+1);
-		stream_read(demuxer->stream, buf, i);
-		buf[i] = 0;
-		demux_info_add(demuxer, "Comment", buf);
-		free(buf);
-	}
+	read_demux_info(demuxer, "Title");
+	read_demux_info(demuxer, "Author");
+	read_demux_info(demuxer, "Copyright");
+	read_demux_info(demuxer, "Comment");
 
 	if (ra_priv->version == 3) {
 	    if(ra_priv->hdr_size + 8 > stream_tell(demuxer->stream)) {

MPlayer-1.2.r38170.tar.xz/libmpdemux/demux_viv.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/demux_viv.c Changed

MPlayer-1.2.r38170.tar.xz/libmpdemux/demuxer.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/demuxer.c Changed

MPlayer-1.2.r38170.tar.xz/libmpdemux/ebml.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/ebml.c Changed

MPlayer-1.2.r38170.tar.xz/libmpdemux/extension.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/extension.c Changed

MPlayer-1.2.r38170.tar.xz/libmpdemux/ms_hdr.h -> MPlayer-1.2.r38304.tar.xz/libmpdemux/ms_hdr.h Changed

@@ -20,10 +20,12 @@
 #define MPLAYER_MS_HDR_H
 
 #include "config.h"
+#include "mppacked.h"
 
 #ifndef _WAVEFORMATEX_
 #define _WAVEFORMATEX_
-typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
+MP_PACKED(
+typedef struct, _WAVEFORMATEX {
   unsigned short  wFormatTag;
   unsigned short  nChannels;
   unsigned int    nSamplesPerSec;
@@ -31,23 +33,28 @@
   unsigned short  nBlockAlign;
   unsigned short  wBitsPerSample;
   unsigned short  cbSize;
-} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
+} WAVEFORMATEX;
+)
+typedef WAVEFORMATEX *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
 #endif /* _WAVEFORMATEX_ */
 
 #ifndef _WAVEFORMATEXTENSIBLE_
 #define _WAVEFORMATEXTENSIBLE_
-typedef struct __attribute__((__packed__)) _WAVEFORMATEXTENSIBLE {
+MP_PACKED(
+typedef struct, _WAVEFORMATEXTENSIBLE {
     WAVEFORMATEX   wf;
     unsigned short wValidBitsPerSample;
     unsigned int   dwChannelMask;
     unsigned int   SubFormat; // Only interested in first 32 bits of guid
     unsigned int   _guid_remainder[3];
 } WAVEFORMATEXTENSIBLE;
+)
 #endif /* _WAVEFORMATEXTENSIBLE_ */
 
 #ifndef _MPEGLAYER3WAVEFORMAT_
 #define _MPEGLAYER3WAVEFORMAT_
-typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
+MP_PACKED(
+typedef struct, mpeglayer3waveformat_tag {
   WAVEFORMATEX wf;
   unsigned short wID;
   unsigned int   fdwFlags;
@@ -55,12 +62,14 @@
   unsigned short nFramesPerBlock;
   unsigned short nCodecDelay;
 } MPEGLAYER3WAVEFORMAT;
+)
 #endif /* _MPEGLAYER3WAVEFORMAT_ */
 
 /* windows.h #includes wingdi.h on MinGW. */
 #if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_)
 #define _BITMAPINFOHEADER_
-typedef struct __attribute__((__packed__))
+MP_PACKED(
+typedef struct,
 {
     int 	biSize;
     int  	biWidth;
@@ -73,7 +82,9 @@
     int  	biYPelsPerMeter;
     int 	biClrUsed;
     int 	biClrImportant;
-} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
+} BITMAPINFOHEADER;
+)
+typedef BITMAPINFOHEADER *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
 typedef struct {
 	BITMAPINFOHEADER bmiHeader;
 	int	bmiColors[1];

MPlayer-1.2.r38170.tar.xz/libmpdemux/muxer_mpeg.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/muxer_mpeg.c Changed

@@ -20,13 +20,13 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 
+#include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
@@ -2502,21 +2502,21 @@
 
 	if(conf_mux != NULL)
 	{
-		if(! strcasecmp(conf_mux, "mpeg1"))
+		if(! av_strcasecmp(conf_mux, "mpeg1"))
 		{
 			priv->mux = MUX_MPEG1;
 			priv->packet_size = 2048;
 			priv->is_genmpeg1 = 1;
 			priv->muxrate = 1800 * 125;	//Constrained parameters
 		}
-		else if(! strcasecmp(conf_mux, "dvd"))
+		else if(! av_strcasecmp(conf_mux, "dvd"))
 		{
 			priv->mux = MUX_MPEG2;
 			priv->is_dvd = 1;
 			priv->packet_size = 2048;
 			priv->muxrate = 10080 * 125;
 		}
-		else if(! strcasecmp(conf_mux, "xsvcd"))
+		else if(! av_strcasecmp(conf_mux, "xsvcd"))
 		{
 			priv->mux = MUX_MPEG2;
 			priv->is_xsvcd = 1;
@@ -2524,7 +2524,7 @@
 			priv->muxrate = 150*2324;
 			priv->ts_allframes = 1;
 		}
-		else if(! strcasecmp(conf_mux, "xvcd"))
+		else if(! av_strcasecmp(conf_mux, "xvcd"))
 		{
 			priv->mux = MUX_MPEG1;
 			priv->is_xvcd = 1;
@@ -2532,7 +2532,7 @@
 			priv->muxrate = 75*2352;
 			priv->ts_allframes = 1;
 		}
-		else if(! strcasecmp(conf_mux, "pes1"))
+		else if(! av_strcasecmp(conf_mux, "pes1"))
 		{
 			priv->mux = MUX_MPEG1;
 			priv->rawpes = 1;
@@ -2540,7 +2540,7 @@
 			priv->muxrate = 10080 * 125;
 			priv->ts_allframes = 1;
 		}
-		else if(! strcasecmp(conf_mux, "pes2"))
+		else if(! av_strcasecmp(conf_mux, "pes2"))
 		{
 			priv->mux = MUX_MPEG2;
 			priv->rawpes = 1;
@@ -2550,7 +2550,7 @@
 		}
 		else
 		{
-			if(strcasecmp(conf_mux, "mpeg2"))
+			if(av_strcasecmp(conf_mux, "mpeg2"))
 				mp_msg(MSGT_MUXER, MSGL_ERR, "Unknown format %s, default to mpeg2\n", conf_mux);
 			priv->mux = MUX_MPEG2;
 			priv->is_genmpeg2 = 1;

MPlayer-1.2.r38170.tar.xz/libmpdemux/video.c -> MPlayer-1.2.r38304.tar.xz/libmpdemux/video.c Changed

@@ -134,7 +134,7 @@
    }
    mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");
    if(!videobuffer) {
-     videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);
+     videobuffer = av_malloc(VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);
      if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE);
      else {
        mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);
@@ -229,7 +229,7 @@
    }
    mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");
    if(!videobuffer) {
-     videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);
+     videobuffer = av_malloc(VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);
      if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE);
      else {
        mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);
@@ -275,7 +275,7 @@
  case VIDEO_HEVC: {
    videobuf_len=0; videobuf_code_len=0;
    if(!videobuffer) {
-     videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);
+     videobuffer = av_malloc(VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);
      if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE);
      else {
        mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);
@@ -306,7 +306,7 @@
    mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");
    // ========= Read & process sequence header & extension ============
    if(!videobuffer) {
-     videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);
+     videobuffer = av_malloc(VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);
      if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE);
      else {
        mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);
@@ -374,7 +374,7 @@
    }
    mp_msg(MSGT_DECVIDEO,MSGL_INFO,"found\n");
    if(!videobuffer) {
-     videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);
+     videobuffer = av_malloc(VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);
      if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE);
      else {
        mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);

MPlayer-1.2.r38170.tar.xz/libvo/aclib.c -> MPlayer-1.2.r38304.tar.xz/libvo/aclib.c Changed

@@ -41,7 +41,7 @@
 //#define COMPILE_C
 //#endif
 
-#if ARCH_X86
+#if ARCH_X86 && HAVE_INLINE_ASM
 
 #if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT
 #define COMPILE_MMX
@@ -160,7 +160,7 @@
 void * fast_memcpy(void * to, const void * from, size_t len)
 {
 #if CONFIG_RUNTIME_CPUDETECT
-#if ARCH_X86
+#if ARCH_X86 && HAVE_INLINE_ASM
 	// ordered per speed fasterst first
 	if(gCpuCaps.hasSSE2)
 		fast_memcpy_SSE(to, from, len);
@@ -174,13 +174,13 @@
 #endif
 		memcpy(to, from, len); // prior to mmx we use the standart memcpy
 #else
-#if HAVE_SSE2
+#if HAVE_SSE2_INLINE
 		fast_memcpy_SSE(to, from, len);
-#elif HAVE_MMX2
+#elif HAVE_MMX2_INLINE
 		fast_memcpy_MMX2(to, from, len);
-#elif HAVE_AMD3DNOW
+#elif HAVE_AMD3DNOW_INLINE
 		fast_memcpy_3DNow(to, from, len);
-#elif HAVE_MMX
+#elif HAVE_MMX_INLINE
 		fast_memcpy_MMX(to, from, len);
 #else
 		memcpy(to, from, len); // prior to mmx we use the standart memcpy
@@ -194,7 +194,7 @@
 void * mem2agpcpy(void * to, const void * from, size_t len)
 {
 #if CONFIG_RUNTIME_CPUDETECT
-#if ARCH_X86
+#if ARCH_X86 && HAVE_INLINE_ASM
 	// ordered per speed fasterst first
 	if(gCpuCaps.hasSSE2)
 		mem2agpcpy_SSE(to, from, len);
@@ -208,13 +208,13 @@
 #endif
 		memcpy(to, from, len); // prior to mmx we use the standart memcpy
 #else
-#if HAVE_SSE2
+#if HAVE_SSE2_INLINE
 		mem2agpcpy_SSE(to, from, len);
-#elif HAVE_MMX2
+#elif HAVE_MMX2_INLINE
 		mem2agpcpy_MMX2(to, from, len);
-#elif HAVE_AMD3DNOW
+#elif HAVE_AMD3DNOW_INLINE
 		mem2agpcpy_3DNow(to, from, len);
-#elif HAVE_MMX
+#elif HAVE_MMX_INLINE
 		mem2agpcpy_MMX(to, from, len);
 #else
 		memcpy(to, from, len); // prior to mmx we use the standart memcpy

MPlayer-1.2.r38170.tar.xz/libvo/gl_common.c -> MPlayer-1.2.r38304.tar.xz/libvo/gl_common.c Changed

@@ -2389,7 +2389,11 @@
 #include "sdl_common.h"
 
 static void swapGlBuffers_sdl(MPGLContext *ctx) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+  SDL_GL_SwapWindow(sdl_window);
+#else
   SDL_GL_SwapBuffers();
+#endif
 }
 
 static void *sdlgpa(const GLubyte *name) {
@@ -2406,6 +2410,16 @@
   return SET_WINDOW_OK;
 }
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+SDL_GLContext sdl_gl_context;
+#endif
+
+static void releaseGlContext_sdl() {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+  SDL_GL_DeleteContext(sdl_gl_context);
+#endif
+}
+
 static int sdl_check_events(void) {
   int res = 0;
   SDL_Event event;
@@ -2414,8 +2428,10 @@
   }
   // poll "events" from within MPlayer code
   res |= sdl_default_handle_event(NULL);
+#if !SDL_VERSION_ATLEAST(2, 0, 0)
   if (res & VO_EVENT_RESIZE)
     sdl_set_mode(0, SDL_OPENGL | SDL_RESIZABLE);
+#endif
   return res;
 }
 
@@ -2711,6 +2727,7 @@
   case GLTYPE_SDL:
     SDL_Init(SDL_INIT_VIDEO);
     ctx->setGlWindow = setGlWindow_sdl;
+    ctx->releaseGlContext = releaseGlContext_sdl;
     ctx->swapGlBuffers = swapGlBuffers_sdl;
     ctx->check_events = sdl_check_events;
     ctx->fullscreen = vo_sdl_fullscreen;
@@ -2778,7 +2795,20 @@
       GLX_DOUBLEBUFFER, GLX_STEREO, None
     };
     XVisualInfo *vinfo = NULL;
+#ifdef CONFIG_GUI
+    int value;
+
+    if (gui_vinfo && glXGetConfig(mDisplay, gui_vinfo, GLX_USE_GL, &value) == 0 && value == True)
+      vinfo = gui_vinfo;
+#endif
     if (flags & VOFLAG_STEREO) {
+#ifdef CONFIG_GUI
+      if (vinfo) {
+        if (glXGetConfig(mDisplay, vinfo, GLX_STEREO, &value) != 0 || value == False)
+          vinfo = NULL;
+      }
+      else
+#endif
       vinfo = glXChooseVisual(mDisplay, mScreen, stereo_glx_attribs);
       if (!vinfo)
         mp_msg(MSGT_VO, MSGL_ERR, "[gl] Could not find a stereo visual, "
@@ -2800,6 +2830,9 @@
 #ifdef CONFIG_GL_SDL
   if (ctx->type == GLTYPE_SDL && !vo_sdl_config(d_width, d_height, flags, title))
     return -1;
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+  sdl_gl_context = SDL_GL_CreateContext(sdl_window);
+#endif
 #endif
   return 0;
 }

MPlayer-1.2.r38170.tar.xz/libvo/gl_common.h -> MPlayer-1.2.r38304.tar.xz/libvo/gl_common.h Changed

MPlayer-1.2.r38170.tar.xz/libvo/osx_objc_common.m -> MPlayer-1.2.r38304.tar.xz/libvo/osx_objc_common.m Changed

@@ -20,6 +20,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define GL_SILENCE_DEPRECATION
+
 #import "osx_objc_common.h"
 #include <Carbon/Carbon.h>
 #include <CoreServices/CoreServices.h>
@@ -139,8 +141,13 @@
 {
 	NSScreen *screen_handle = [self fullscreen_screen];
 	NSRect screen_frame = [screen_handle frame];
-	vo_screenwidth = screen_frame.size.width;
-	vo_screenheight = screen_frame.size.height;
+	NSSize size = screen_frame.size;
+#ifndef __POWER__
+	if ([self respondsToSelector:@selector(convertSizeToBacking:)])
+		size = [self convertSizeToBacking:size];
+#endif
+	vo_screenwidth = size.width;
+	vo_screenheight = size.height;
 	xinerama_x = screen_frame.origin.x;
 	xinerama_y = screen_frame.origin.y;
 	aspect_save_screenres(vo_screenwidth, vo_screenheight);
@@ -241,9 +248,15 @@
 
 - (void)reshape
 {
+	[super reshape];
 	NSRect frame = [self frame];
-	vo_dwidth  = frame.size.width;
-	vo_dheight = frame.size.height;
+	NSSize size = frame.size;
+#ifndef __POWER__
+	if ([self respondsToSelector:@selector(convertSizeToBacking:)])
+		size = [self convertSizeToBacking:size];
+#endif
+	vo_dwidth  = size.width;
+	vo_dheight = size.height;
 	event_flags |= VO_EVENT_RESIZE;
 }
 
@@ -269,55 +282,39 @@
 
 //Create Movie Menu
 	menu = [[NSMenu alloc] initWithTitle:@"Movie"];
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"]; [menu addItem:menuItem];
-	kHalfScreenCmd = menuItem;
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"]; [menu addItem:menuItem];
-	kNormalScreenCmd = menuItem;
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"]; [menu addItem:menuItem];
-	kDoubleScreenCmd = menuItem;
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem];
-	kFullScreenCmd = menuItem;
-	menuItem = [NSMenuItem separatorItem]; [menu addItem:menuItem];
+	kHalfScreenCmd = [menu addItemWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"];
+	kNormalScreenCmd = [menu addItemWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"];
+	kDoubleScreenCmd = [menu addItemWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"];
+	kFullScreenCmd = [menu addItemWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"];
+	[menu addItem: [NSMenuItem separatorItem]];
 
 	aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"];
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
-	if(vo_keepaspect) [menuItem setState:NSOnState];
-	kKeepAspectCmd = menuItem;
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
-	if(vo_panscan) [menuItem setState:NSOnState];
-	kPanScanCmd = menuItem;
-	menuItem = [NSMenuItem separatorItem]; [aspectMenu addItem:menuItem];
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
-	kAspectOrgCmd = menuItem;
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
-	kAspectFullCmd = menuItem;
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""];	[aspectMenu addItem:menuItem];
-	kAspectWideCmd = menuItem;
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""];
+	kKeepAspectCmd = [aspectMenu addItemWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""];
+	if(vo_keepaspect) [kKeepAspectCmd setState:NSOnState];
+	kPanScanCmd = [aspectMenu addItemWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""];
+	if(vo_panscan) [kPanScanCmd setState:NSOnState];
+	[aspectMenu addItem:[NSMenuItem separatorItem]];
+	kAspectOrgCmd = [aspectMenu addItemWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""];
+	kAspectFullCmd = [aspectMenu addItemWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""];
+	kAspectWideCmd = [aspectMenu addItemWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""];
+	menuItem = [menu addItemWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""];
 	[menuItem setSubmenu:aspectMenu];
-	[menu addItem:menuItem];
-	[aspectMenu release];
 
 	//Add to menubar
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Movie" action:nil keyEquivalent:@""];
+	menuItem = [mainMenu addItemWithTitle:@"Movie" action:nil keyEquivalent:@""];
 	[menuItem setSubmenu:menu];
-	[mainMenu addItem:menuItem];
 
 //Create Window Menu
 	menu = [[NSMenu alloc] initWithTitle:@"Window"];
 
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [menu addItem:menuItem];
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; [menu addItem:menuItem];
+	[menu addItemWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
+	[menu addItemWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""];
 
 	//Add to menubar
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
+	menuItem = [mainMenu addItemWithTitle:@"Window" action:nil keyEquivalent:@""];
 	[menuItem setSubmenu:menu];
-	[mainMenu addItem:menuItem];
 	[NSApp setWindowsMenu:menu];
 	[NSApp setMainMenu:mainMenu];
-
-	[menu release];
-	[menuItem release];
 }
 
 - (void)set_winSizeMult:(float)mult
@@ -400,7 +397,7 @@
 	//go fullscreen
 	if(vo_fs)
 	{
-		if ([window respondsToSelector:@selector(enterFullScreenMode)]) {
+		if ([window respondsToSelector:@selector(enterFullScreenMode:)]) {
 		[window enterFullScreenMode:[self fullscreen_screen]];
 		}
 		if(!vo_rootwin)
@@ -413,16 +410,21 @@
 		old_frame = [window frame];	//save main window size & position
 		[self update_screen_info];
 
-		[window setFrame:NSMakeRect(xinerama_x, xinerama_y, vo_screenwidth, vo_screenheight) display:YES animate:animate]; //zoom-in window with nice useless sfx
+		NSSize size = { vo_screenwidth, vo_screenheight };
+#ifndef __POWER__
+		if ([self respondsToSelector:@selector(convertSizeFromBacking:)])
+			size = [self convertSizeFromBacking:size];
+#endif
+		[window setFrame:NSMakeRect(xinerama_x, xinerama_y, size.width, size.height) display:YES animate:animate]; //zoom-in window with nice useless sfx
 		old_view_frame = [self bounds];
 
-		[self setFrame:NSMakeRect(0, 0, vo_screenwidth, vo_screenheight)];
+		[self setFrame:NSMakeRect(0, 0, size.width, size.height)];
 		[self setNeedsDisplay:YES];
 		[window setHasShadow:NO];
 	}
 	else
 	{
-		if ([window respondsToSelector:@selector(exitFullScreenMode)]) {
+		if ([window respondsToSelector:@selector(exitFullScreenMode:)]) {
 		[window exitFullScreenMode:[self fullscreen_screen]];
 		}
 		SetSystemUIMode( kUIModeNormal, 0);

MPlayer-1.2.r38170.tar.xz/libvo/sdl_common.c -> MPlayer-1.2.r38304.tar.xz/libvo/sdl_common.c Changed

@@ -32,6 +32,7 @@
 static int old_h;
 static int mode_flags;
 static int reinit;
+SDL_Window *sdl_window;
 
 /**
  * Update vo_screenwidth and vo_screenheight.
@@ -43,11 +44,16 @@
  * update_xinerama_info function.
  */
 static void get_screensize(void) {
-    const SDL_VideoInfo *vi;
-    // TODO: better to use a check that gets the runtime version instead?
-#if SDL_VERSION_ATLEAST(1, 2, 10)
     // Keep user-provided settings
     if (vo_screenwidth > 0 || vo_screenheight > 0) return;
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+    SDL_DisplayMode m;
+    if (SDL_GetCurrentDisplayMode(0, &m)) return;
+    vo_screenwidth = m.w;
+    vo_screenheight = m.h;
+    // TODO: better to use a check that gets the runtime version instead?
+#elif SDL_VERSION_ATLEAST(1, 2, 10)
+    const SDL_VideoInfo *vi;
     vi = SDL_GetVideoInfo();
     vo_screenwidth  = vi->current_w;
     vo_screenheight = vi->current_h;
@@ -69,8 +75,10 @@
         }
         if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE) < 0)
             return 0;
+        sdl_window = NULL;
     }
 
+#if !SDL_VERSION_ATLEAST(2, 0, 0)
     // Setup Keyrepeats (500/30 are defaults)
     SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, 100 /*SDL_DEFAULT_REPEAT_INTERVAL*/);
 
@@ -79,6 +87,7 @@
 
     // We don't want those in our event queue.
     SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
+#endif
     SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
     SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
 
@@ -92,11 +101,14 @@
 {
     if (SDL_WasInit(SDL_INIT_VIDEO))
         SDL_QuitSubSystem(SDL_INIT_VIDEO);
+    sdl_window = NULL;
 }
 
 int vo_sdl_config(int w, int h, int flags, const char *title)
 {
+#if !SDL_VERSION_ATLEAST(2, 0, 0)
     SDL_WM_SetCaption(title, NULL);
+#endif
     vo_dwidth  = old_w = w;
     vo_dheight = old_h = h;
     vo_fs = !!(flags & VOFLAG_FULLSCREEN);
@@ -104,6 +116,17 @@
         vo_dwidth  = vo_screenwidth;
         vo_dheight = vo_screenheight;
     }
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+    if (!sdl_window) {
+        unsigned sdlflags = SDL_OPENGL;
+        if (vo_fs) flags |= SDL_FULLSCREEN;
+        if (!vo_border) flags |= SDL_NOFRAME;
+        sdl_window = SDL_CreateWindow(title,
+                                      geometry_xy_changed ? vo_dx : SDL_WINDOWPOS_UNDEFINED,
+                                      geometry_xy_changed ? vo_dy : SDL_WINDOWPOS_UNDEFINED,
+                                      vo_dwidth, vo_dheight, sdlflags);
+    }
+#endif
     SDL_GL_SetAttribute(SDL_GL_STEREO, !!(flags & VOFLAG_STEREO));
     return 1;
 }
@@ -120,16 +143,33 @@
         vo_dheight = vo_screenheight;
     }
     vo_fs = !vo_fs;
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+    SDL_SetWindowFullscreen(sdl_window, vo_fs ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
+#else
     sdl_set_mode(0, mode_flags);
+#endif
     // on OSX at least we now need to do a full reinit.
     // TODO: this should only be set if really necessary.
     reinit = 1;
 }
 
-SDL_Surface *sdl_set_mode(int bpp, uint32_t flags)
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+int
+#else
+SDL_Surface *
+#endif
+sdl_set_mode(int bpp, uint32_t flags)
 {
     SDL_Surface *s;
     mode_flags = flags;
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+    if (!sdl_window) return 0;
+    SDL_SetWindowSize(sdl_window, vo_dwidth, vo_dheight);
+    if (geometry_xy_changed) SDL_SetWindowPosition(sdl_window, vo_dx, vo_dy);
+    if (flags & SDL_OPENGL) SDL_GL_GetDrawableSize(sdl_window, &vo_dwidth, &vo_dheight);
+    else SDL_GetWindowSize(sdl_window, &vo_dwidth, &vo_dheight);
+    return 1;
+#else
     if (vo_fs) flags |= SDL_FULLSCREEN;
     // doublebuf with opengl creates flickering
 #if !defined( __AMIGAOS4__ ) && !defined( __APPLE__ )
@@ -151,6 +191,7 @@
     vo_dwidth  = s->w;
     vo_dheight = s->h;
     return s;
+#endif
 }
 
 static const struct mp_keymap keysym_map[] = {
@@ -164,10 +205,17 @@
     {SDLK_UP, KEY_UP}, {SDLK_DOWN, KEY_DOWN},
     {SDLK_LEFT, KEY_LEFT}, {SDLK_RIGHT, KEY_RIGHT},
     {SDLK_KP_MULTIPLY, '*'}, {SDLK_KP_DIVIDE, '/'},
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+    {SDLK_KP_0, KEY_KP0}, {SDLK_KP_1, KEY_KP1}, {SDLK_KP_2, KEY_KP2},
+    {SDLK_KP_3, KEY_KP3}, {SDLK_KP_4, KEY_KP4}, {SDLK_KP_5, KEY_KP5},
+    {SDLK_KP_6, KEY_KP6}, {SDLK_KP_7, KEY_KP7}, {SDLK_KP_8, KEY_KP8},
+    {SDLK_KP_9, KEY_KP9},
+#else
     {SDLK_KP0, KEY_KP0}, {SDLK_KP1, KEY_KP1}, {SDLK_KP2, KEY_KP2},
     {SDLK_KP3, KEY_KP3}, {SDLK_KP4, KEY_KP4}, {SDLK_KP5, KEY_KP5},
     {SDLK_KP6, KEY_KP6}, {SDLK_KP7, KEY_KP7}, {SDLK_KP8, KEY_KP8},
     {SDLK_KP9, KEY_KP9},
+#endif
     {SDLK_KP_PERIOD, KEY_KPDEC}, {SDLK_KP_ENTER, KEY_KPENTER},
     {0, 0}
 };
@@ -181,6 +229,19 @@
         return res;
     }
     switch (event->type) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+    case SDL_WINDOWEVENT:
+        switch (event->window.event)
+        {
+        case SDL_WINDOWEVENT_SIZE_CHANGED:
+            vo_dwidth  = event->window.data1;
+            vo_dheight = event->window.data2;
+            return VO_EVENT_RESIZE;
+        case SDL_WINDOWEVENT_EXPOSED:
+            return VO_EVENT_EXPOSE;
+        }
+        break;
+#else
     case SDL_VIDEORESIZE:
         vo_dwidth  = event->resize.w;
         vo_dheight = event->resize.h;
@@ -188,6 +249,7 @@
 
     case SDL_VIDEOEXPOSE:
         return VO_EVENT_EXPOSE;
+#endif
 
     case SDL_MOUSEMOTION:
         vo_mouse_movement(event->motion.x, event->motion.y);
@@ -205,10 +267,15 @@
 
     case SDL_KEYDOWN:
         mpkey = lookup_keymap_table(keysym_map, event->key.keysym.sym);
-        if (!mpkey &&
-            event->key.keysym.unicode > 0 &&
-            event->key.keysym.unicode < 128)
-            mpkey = event->key.keysym.unicode;
+        {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+        unsigned code = event->key.keysym.sym;
+#else
+        unsigned code = event->key.keysym.unicode;
+#endif
+        if (!mpkey && code > 0 && code < 128)
+            mpkey = code;
+        }
         if (mpkey)
             mplayer_put_key(mpkey);
         break;

MPlayer-1.2.r38170.tar.xz/libvo/sdl_common.h -> MPlayer-1.2.r38304.tar.xz/libvo/sdl_common.h Changed

MPlayer-1.2.r38170.tar.xz/libvo/video_out.c -> MPlayer-1.2.r38304.tar.xz/libvo/video_out.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_aa.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_aa.c Changed

@@ -31,10 +31,10 @@
 #include <stdarg.h>
 #include <time.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "libmpcodecs/vf.h"
@@ -572,11 +572,11 @@
     if  (s==NULL) return -1;
     i=strtol(s, &rest, 10);
     if ((rest==NULL || strlen(rest)==0) && i>=0 && i<=5) return i;
-    if (!strcasecmp(s, "normal")) return AA_NORMAL;
-    else if (!strcasecmp(s, "dim")) return AA_DIM;
-    else if (!strcasecmp(s, "bold")) return AA_BOLD;
-    else if (!strcasecmp(s, "boldfont")) return AA_BOLDFONT;
-    else if (!strcasecmp(s, "special")) return AA_SPECIAL;
+    if (!av_strcasecmp(s, "normal")) return AA_NORMAL;
+    else if (!av_strcasecmp(s, "dim")) return AA_DIM;
+    else if (!av_strcasecmp(s, "bold")) return AA_BOLD;
+    else if (!av_strcasecmp(s, "boldfont")) return AA_BOLDFONT;
+    else if (!av_strcasecmp(s, "special")) return AA_SPECIAL;
     else return -1;
 }

MPlayer-1.2.r38170.tar.xz/libvo/vo_corevideo.m -> MPlayer-1.2.r38304.tar.xz/libvo/vo_corevideo.m Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_dfbmga.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_dfbmga.c Changed

@@ -26,9 +26,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "video_out.h"
 #define NO_DRAW_FRAME
 #include "video_out_internal.h"
@@ -1339,19 +1339,19 @@
 
      ca.flags = DCAF_NONE;
 
-     if (!strcasecmp( data, "brightness" )) {
+     if (!av_strcasecmp( data, "brightness" )) {
           ca.flags      |= DCAF_BRIGHTNESS;
           ca.brightness  = value * factor + 0x8000;
      }
-     if (!strcasecmp( data, "contrast" )) {
+     if (!av_strcasecmp( data, "contrast" )) {
           ca.flags    |= DCAF_CONTRAST;
           ca.contrast  = value * factor + 0x8000;
      }
-     if (!strcasecmp( data, "hue" )) {
+     if (!av_strcasecmp( data, "hue" )) {
           ca.flags |= DCAF_HUE;
           ca.hue    = value * factor + 0x8000;
      }
-     if (!strcasecmp( data, "saturation" )) {
+     if (!av_strcasecmp( data, "saturation" )) {
           ca.flags      |= DCAF_SATURATION;
           ca.saturation  = value * factor + 0x8000;
      }
@@ -1388,16 +1388,16 @@
      if (res != DFB_OK)
           return VO_FALSE;
 
-     if (!strcasecmp( data, "brightness" ) &&
+     if (!av_strcasecmp( data, "brightness" ) &&
          (ca.flags & DCAF_BRIGHTNESS))
           *value = (ca.brightness - 0x8000) * factor;
-     if (!strcasecmp( data, "contrast" ) &&
+     if (!av_strcasecmp( data, "contrast" ) &&
          (ca.flags & DCAF_CONTRAST))
           *value = (ca.contrast - 0x8000) * factor;
-     if (!strcasecmp( data, "hue" ) &&
+     if (!av_strcasecmp( data, "hue" ) &&
          (ca.flags & DCAF_HUE))
           *value = (ca.hue - 0x8000) * factor;
-     if (!strcasecmp( data, "saturation" ) &&
+     if (!av_strcasecmp( data, "saturation" ) &&
          (ca.flags & DCAF_SATURATION))
           *value = (ca.saturation - 0x8000) * factor;

MPlayer-1.2.r38170.tar.xz/libvo/vo_dxr2.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_dxr2.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_dxr3.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_dxr3.c Changed

@@ -29,13 +29,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <time.h>
 #include <math.h>
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "fastmemcpy.h"
@@ -256,11 +256,11 @@
 
 		if (ioctl(fd_control, EM8300_IOCTL_GETBCS, &bcs) < 0)
 		    return VO_FALSE;
-		if (!strcasecmp(eq->item, "brightness"))
+		if (!av_strcasecmp(eq->item, "brightness"))
 		    bcs.brightness = (eq->value+100)*5;
-		else if (!strcasecmp(eq->item, "contrast"))
+		else if (!av_strcasecmp(eq->item, "contrast"))
 		    bcs.contrast = (eq->value+100)*5;
-		else if (!strcasecmp(eq->item, "saturation"))
+		else if (!av_strcasecmp(eq->item, "saturation"))
 		    bcs.saturation = (eq->value+100)*5;
 		else return VO_FALSE;
 
@@ -276,11 +276,11 @@
 		if (ioctl(fd_control, EM8300_IOCTL_GETBCS, &bcs) < 0)
 		    return VO_FALSE;
 
-		if (!strcasecmp(eq->item, "brightness"))
+		if (!av_strcasecmp(eq->item, "brightness"))
 		    eq->value = (bcs.brightness/5)-100;
-		else if (!strcasecmp(eq->item, "contrast"))
+		else if (!av_strcasecmp(eq->item, "contrast"))
 		    eq->value = (bcs.contrast/5)-100;
-		else if (!strcasecmp(eq->item, "saturation"))
+		else if (!av_strcasecmp(eq->item, "saturation"))
 		    eq->value = (bcs.saturation/5)-100;
 		else return VO_FALSE;

MPlayer-1.2.r38170.tar.xz/libvo/vo_gif89a.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_gif89a.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_gl.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_gl.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_gl_tiled.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_gl_tiled.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_jpeg.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_jpeg.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_kva.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_kva.c Changed

@@ -812,12 +812,21 @@
             d_height++;
         }
 
-        m_int.rclDst.xLeft   = ((LONG)vo_screenwidth  - (LONG)d_width)  / 2;
-        m_int.rclDst.yBottom = ((LONG)vo_screenheight - (LONG)d_height) / 2;
+        vo_dx = (vo_screenwidth - d_width) / 2;
+        vo_dy = (vo_screenheight - d_height ) / 2;
+        geometry(&vo_dx, &vo_dy, &d_width, &d_height,
+                 vo_screenwidth, vo_screenheight);
+
+        m_int.rclDst.xLeft   = vo_dx;
+        // invert Y
+        m_int.rclDst.yBottom = vo_screenheight - (vo_dy + d_height);
         m_int.rclDst.xRight  = m_int.rclDst.xLeft   + d_width;
         m_int.rclDst.yTop    = m_int.rclDst.yBottom + d_height;
 
         if (vo_fs) {
+            vo_dx = 0;
+            vo_dy = 0;
+
             d_width  = vo_screenwidth;
             d_height = vo_screenheight;
 
@@ -831,10 +840,11 @@
             setAspectRatio(KVAR_FORCEANY);
         }
 
-        rcl.xLeft   = ((LONG)vo_screenwidth  - (LONG)d_width) / 2;
-        rcl.yBottom = ((LONG)vo_screenheight - (LONG)d_height) /2 ;
-        rcl.xRight  = rcl.xLeft              + d_width;
-        rcl.yTop    = rcl.yBottom            + d_height;
+        rcl.xLeft   = vo_dx;
+        // invert Y
+        rcl.yBottom = vo_screenheight - (vo_dy + d_height);
+        rcl.xRight  = rcl.xLeft   + d_width;
+        rcl.yTop    = rcl.yBottom + d_height;
     } else {
         vo_fs = 0;

MPlayer-1.2.r38170.tar.xz/libvo/vo_matrixview.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_matrixview.c Changed

@@ -25,7 +25,8 @@
 #include "config.h"
 
 #include <stdint.h>
-#include <strings.h>
+
+#include "libavutil/avstring.h"
 
 #include "mp_msg.h"
 #include "subopt-helper.h"
@@ -266,9 +267,9 @@
         {
             vf_equalizer_t *eq=data;
 
-            if (strcasecmp(eq->item, "contrast") == 0) {
+            if (av_strcasecmp(eq->item, "contrast") == 0) {
                 eq->value = eq_contrast;
-            } else if (strcasecmp(eq->item, "brightness") == 0) {
+            } else if (av_strcasecmp(eq->item, "brightness") == 0) {
                 eq->value = eq_brightness;
             }
         }
@@ -276,9 +277,9 @@
     case VOCTRL_SET_EQUALIZER:
         {
             vf_equalizer_t *eq=data;
-            if (strcasecmp(eq->item, "contrast") == 0) {
+            if (av_strcasecmp(eq->item, "contrast") == 0) {
                 contrast_set(eq->value);
-            } else if (strcasecmp(eq->item, "brightness") == 0) {
+            } else if (av_strcasecmp(eq->item, "brightness") == 0) {
                 brightness_set(eq->value);
             }
         }
@@ -286,6 +287,8 @@
     case VOCTRL_UPDATE_SCREENINFO:
         glctx.update_xinerama_info();
         return VO_TRUE;
+    case VOCTRL_GUISUPPORT:
+        return VO_TRUE;
     }
     return VO_NOTIMPL;
 }

MPlayer-1.2.r38170.tar.xz/libvo/vo_md5sum.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_md5sum.c Changed

@@ -66,6 +66,7 @@
 
 char *md5sum_outfile = NULL;
 
+struct AVMD5 *md5_context;
 FILE *md5sum_fd;
 int framenum = 0;
 
@@ -153,6 +154,8 @@
         exit_player(EXIT_ERROR);
     }
 
+    md5_context = av_md5_alloc();
+
     return 0;
 }
 
@@ -195,8 +198,6 @@
     uint32_t strideU = mpi->stride[1];
     uint32_t strideV = mpi->stride[2];
 
-    uint8_t md5_context_memory[av_md5_size];
-    struct AVMD5 *md5_context = (struct AVMD5*) md5_context_memory;
     unsigned int i;
 
     if (mpi->flags & MP_IMGFLAG_PLANAR) { /* Planar */
@@ -255,8 +256,6 @@
             return query_format(*((uint32_t*)data));
         case VOCTRL_DRAW_IMAGE:
             return draw_image(data);
-        case VOCTRL_GUISUPPORT:
-            return VO_TRUE;
     }
     return VO_NOTIMPL;
 }
@@ -268,6 +267,7 @@
     free(md5sum_outfile);
     md5sum_outfile = NULL;
     if (md5sum_fd && md5sum_fd != stdout) fclose(md5sum_fd);
+    av_freep(&md5_context);
 }
 
 /* ------------------------------------------------------------------------- */

MPlayer-1.2.r38170.tar.xz/libvo/vo_null.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_null.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_png.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_png.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_pnm.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_pnm.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_tga.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_tga.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_vdpau.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_vdpau.c Changed

@@ -33,7 +33,6 @@
  */
 
 #include <stdio.h>
-#include <strings.h>
 #include <vdpau/vdpau_x11.h>
 
 #include "config.h"
@@ -54,6 +53,7 @@
 #include "libavcodec/vdpau.h"
 
 #include "libavutil/common.h"
+#include "libavutil/avstring.h"
 #include "libavutil/mathematics.h"
 
 
@@ -1386,13 +1386,13 @@
 
 static int get_equalizer(const char *name, int *value)
 {
-    if (!strcasecmp(name, "brightness"))
+    if (!av_strcasecmp(name, "brightness"))
         *value = procamp.brightness * 100;
-    else if (!strcasecmp(name, "contrast"))
+    else if (!av_strcasecmp(name, "contrast"))
         *value = (procamp.contrast-1.0) * 100;
-    else if (!strcasecmp(name, "saturation"))
+    else if (!av_strcasecmp(name, "saturation"))
         *value = (procamp.saturation-1.0) * 100;
-    else if (!strcasecmp(name, "hue"))
+    else if (!av_strcasecmp(name, "hue"))
         *value = procamp.hue * 100 / M_PI;
     else
         return VO_NOTIMPL;
@@ -1401,13 +1401,13 @@
 
 static int set_equalizer(const char *name, int value)
 {
-    if (!strcasecmp(name, "brightness"))
+    if (!av_strcasecmp(name, "brightness"))
         procamp.brightness = value / 100.0;
-    else if (!strcasecmp(name, "contrast"))
+    else if (!av_strcasecmp(name, "contrast"))
         procamp.contrast = value / 100.0 + 1.0;
-    else if (!strcasecmp(name, "saturation"))
+    else if (!av_strcasecmp(name, "saturation"))
         procamp.saturation = value / 100.0 + 1.0;
-    else if (!strcasecmp(name, "hue"))
+    else if (!av_strcasecmp(name, "hue"))
         procamp.hue = value / 100.0 * M_PI;
     else
         return VO_NOTIMPL;

MPlayer-1.2.r38170.tar.xz/libvo/vo_xvr100.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_xvr100.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_yuv4mpeg.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_yuv4mpeg.c Changed

MPlayer-1.2.r38170.tar.xz/libvo/vo_zr.c -> MPlayer-1.2.r38304.tar.xz/libvo/vo_zr.c Changed

@@ -19,12 +19,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/* $Id: vo_zr.c 35997 2013-03-17 22:47:17Z diego $ */
+/* $Id: vo_zr.c 38233 2021-01-23 18:22:09Z reimar $ */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -36,6 +35,7 @@
 #include <linux/types.h>
 #include <linux/videodev.h>
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "videodev_mjpeg.h"
 #include "video_out.h"
 #include "video_out_internal.h"
@@ -671,7 +671,7 @@
     zr_info_t *zr = &zr_info[zr_parsing];
     int i;
     /* do WE need it ?, always */
-    if (!strcasecmp(opt, "zrdev")) {
+    if (!av_strcasecmp(opt, "zrdev")) {
 	if (param == NULL) return ERR_MISSING_PARAM;
 	//if ((i=getcolor(param))==-1) return ERR_OUT_OF_RANGE;
 	//aaopt_osdcolor=i;
@@ -680,19 +680,19 @@
 	strcpy(zr->device, param);
 	mp_msg(MSGT_VO, MSGL_V, "zr: using device %s\n", zr->device);
 	return 1;
-    } else if (!strcasecmp(opt, "zrbw")) {
+    } else if (!av_strcasecmp(opt, "zrbw")) {
 	    if (param != NULL) {
 		    return ERR_OUT_OF_RANGE;
 	    }
 	    zr->bw = 1;
 	    return 1;
-    } else if (!strcasecmp(opt, "zrfd")) {
+    } else if (!av_strcasecmp(opt, "zrfd")) {
 	    if (param != NULL) {
 		    return ERR_OUT_OF_RANGE;
 	    }
 	    zr->fd = 1;
 	    return 1;
-    } else if (!strcasecmp(opt, "zrcrop")){
+    } else if (!av_strcasecmp(opt, "zrcrop")){
         geo_t *g = &zr->g;
 	if (g->set == 1) {
 		zr_parsing++;
@@ -716,43 +716,43 @@
 	g->set = 1;
 	mp_msg(MSGT_VO, MSGL_V, "zr: cropping %s\n", param);
 	return 1;
-    }else if (!strcasecmp(opt, "zrhdec")) {
+    }else if (!av_strcasecmp(opt, "zrhdec")) {
         i = atoi(param);
 	if (i != 1 && i != 2 && i != 4) return ERR_OUT_OF_RANGE;
 	zr->hdec = i;
 	return 1;
-    }else if (!strcasecmp(opt, "zrvdec")) {
+    }else if (!av_strcasecmp(opt, "zrvdec")) {
         i = atoi(param);
 	if (i != 1 && i != 2 && i != 4) return ERR_OUT_OF_RANGE;
 	zr->vdec = i;
 	return 1;
-    }else if (!strcasecmp(opt, "zrxdoff")) {
+    }else if (!av_strcasecmp(opt, "zrxdoff")) {
         i = atoi(param);
 	zr->xdoff = i;
 	return 1;
-    }else if (!strcasecmp(opt, "zrydoff")) {
+    }else if (!av_strcasecmp(opt, "zrydoff")) {
         i = atoi(param);
 	zr->ydoff = i;
 	return 1;
-    }else if (!strcasecmp(opt, "zrquality")) {
+    }else if (!av_strcasecmp(opt, "zrquality")) {
         i = atoi(param);
 	if (i < 1 || i > 20) return ERR_OUT_OF_RANGE;
 	zr->quality = i;
 	return 1;
-    }else if (!strcasecmp(opt, "zrnorm")) {
+    }else if (!av_strcasecmp(opt, "zrnorm")) {
 	if (param == NULL) return ERR_MISSING_PARAM;
-	if (!strcasecmp(param, "NTSC")) {
+	if (!av_strcasecmp(param, "NTSC")) {
             mp_msg(MSGT_VO, MSGL_V, "zr: Norm set to NTSC\n");
             zr->norm = VIDEO_MODE_NTSC;
 	    return 1;
-	} else if (!strcasecmp(param, "PAL")) {
+	} else if (!av_strcasecmp(param, "PAL")) {
 	    mp_msg(MSGT_VO, MSGL_V, "zr: Norm set to PAL\n");
             zr->norm = VIDEO_MODE_PAL;
 	    return 1;
 	} else {
            return ERR_OUT_OF_RANGE;
         }
-    }else if (!strcasecmp(opt, "zrhelp")){
+    }else if (!av_strcasecmp(opt, "zrhelp")){
 	printf("Help for -vo zr: Zoran ZR360[56]7/ZR36060 based MJPEG capture/playback cards\n");
 	printf("\n");
 	printf("Here are the zr options:\n");
@@ -798,26 +798,26 @@
   zr_count = 1;
   zr_parsing = 0;
 
-  if (!strcasecmp(param, "zrdev")) {
+  if (!av_strcasecmp(param, "zrdev")) {
     free(zr->device);
     zr->device=NULL;
-  } else if (!strcasecmp(param, "zrbw"))
+  } else if (!av_strcasecmp(param, "zrbw"))
     zr->bw=0;
-  else if (!strcasecmp(param, "zrfd"))
+  else if (!av_strcasecmp(param, "zrfd"))
     zr->fd=0;
-  else if (!strcasecmp(param, "zrcrop"))
+  else if (!av_strcasecmp(param, "zrcrop"))
     zr->g.set = zr->g.xoff = zr->g.yoff = 0;
-  else if (!strcasecmp(param, "zrhdec"))
+  else if (!av_strcasecmp(param, "zrhdec"))
     zr->hdec = 1;
-  else if (!strcasecmp(param, "zrvdec"))
+  else if (!av_strcasecmp(param, "zrvdec"))
     zr->vdec = 1;
-  else if (!strcasecmp(param, "zrxdoff"))
+  else if (!av_strcasecmp(param, "zrxdoff"))
     zr->xdoff = -1;
-  else if (!strcasecmp(param, "zrydoff"))
+  else if (!av_strcasecmp(param, "zrydoff"))
     zr->ydoff = -1;
-  else if (!strcasecmp(param, "zrquality"))
+  else if (!av_strcasecmp(param, "zrquality"))
     zr->quality = 2;
-  else if (!strcasecmp(param, "zrnorm"))
+  else if (!av_strcasecmp(param, "zrnorm"))
     zr->norm = VIDEO_MODE_AUTO;
 
 }

MPlayer-1.2.r38170.tar.xz/libvo/vosub_vidix.c -> MPlayer-1.2.r38304.tar.xz/libvo/vosub_vidix.c Changed

@@ -32,10 +32,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 
@@ -599,22 +599,22 @@
 //    printf("vidix seteq %s -> %d  \n",eq->item,eq->value);
 
     /* vidix eq ranges are -1000..1000 */
-    if (!strcasecmp(eq->item, "brightness"))
+    if (!av_strcasecmp(eq->item, "brightness"))
     {
 	info.brightness = eq->value*10;
 	info.cap = VEQ_CAP_BRIGHTNESS;
     }
-    else if (!strcasecmp(eq->item, "contrast"))
+    else if (!av_strcasecmp(eq->item, "contrast"))
     {
 	info.contrast = eq->value*10;
 	info.cap = VEQ_CAP_CONTRAST;
     }
-    else if (!strcasecmp(eq->item, "saturation"))
+    else if (!av_strcasecmp(eq->item, "saturation"))
     {
 	info.saturation = eq->value*10;
 	info.cap = VEQ_CAP_SATURATION;
     }
-    else if (!strcasecmp(eq->item, "hue"))
+    else if (!av_strcasecmp(eq->item, "hue"))
     {
 	info.hue = eq->value*10;
 	info.cap = VEQ_CAP_HUE;
@@ -634,22 +634,22 @@
 	return VO_FALSE;
 
     /* vidix eq ranges are -1000..1000 */
-    if (!strcasecmp(eq->item, "brightness"))
+    if (!av_strcasecmp(eq->item, "brightness"))
     {
 	if (info.cap & VEQ_CAP_BRIGHTNESS)
 	    eq->value = info.brightness/10;
     }
-    else if (!strcasecmp(eq->item, "contrast"))
+    else if (!av_strcasecmp(eq->item, "contrast"))
     {
 	if (info.cap & VEQ_CAP_CONTRAST)
 	    eq->value = info.contrast/10;
     }
-    else if (!strcasecmp(eq->item, "saturation"))
+    else if (!av_strcasecmp(eq->item, "saturation"))
     {
 	if (info.cap & VEQ_CAP_SATURATION)
 	    eq->value = info.saturation/10;
     }
-    else if (!strcasecmp(eq->item, "hue"))
+    else if (!av_strcasecmp(eq->item, "hue"))
     {
 	if (info.cap & VEQ_CAP_HUE)
 	    eq->value = info.hue/10;

MPlayer-1.2.r38170.tar.xz/libvo/x11_common.c -> MPlayer-1.2.r38304.tar.xz/libvo/x11_common.c Changed

@@ -27,10 +27,10 @@
 #include "mp_msg.h"
 #include "mp_fifo.h"
 #include "libavutil/common.h"
+#include "libavutil/avstring.h"
 #include "x11_common.h"
 
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 #include <assert.h>
 
@@ -1903,11 +1903,11 @@
     if (cmap == None)
         return VO_NOTAVAIL;
 
-    if (!strcasecmp(name, "brightness"))
+    if (!av_strcasecmp(name, "brightness"))
         vo_brightness = value;
-    else if (!strcasecmp(name, "contrast"))
+    else if (!av_strcasecmp(name, "contrast"))
         vo_contrast = value;
-    else if (!strcasecmp(name, "gamma"))
+    else if (!av_strcasecmp(name, "gamma"))
         vo_gamma = value;
     else
         return VO_NOTIMPL;
@@ -1938,11 +1938,11 @@
 {
     if (cmap == None)
         return VO_NOTAVAIL;
-    if (!strcasecmp(name, "brightness"))
+    if (!av_strcasecmp(name, "brightness"))
         *value = vo_brightness;
-    else if (!strcasecmp(name, "contrast"))
+    else if (!av_strcasecmp(name, "contrast"))
         *value = vo_contrast;
-    else if (!strcasecmp(name, "gamma"))
+    else if (!av_strcasecmp(name, "gamma"))
         *value = vo_gamma;
     else
         return VO_NOTIMPL;
@@ -1970,29 +1970,29 @@
                 int hue = 0, port_value, port_min, port_max;
 
                 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") &&
-                    (!strcasecmp(name, "brightness")))
+                    (!av_strcasecmp(name, "brightness")))
                     port_value = value;
                 else if (!strcmp(attributes[i].name, "XV_CONTRAST") &&
-                         (!strcasecmp(name, "contrast")))
+                         (!av_strcasecmp(name, "contrast")))
                     port_value = value;
                 else if (!strcmp(attributes[i].name, "XV_SATURATION") &&
-                         (!strcasecmp(name, "saturation")))
+                         (!av_strcasecmp(name, "saturation")))
                     port_value = value;
                 else if (!strcmp(attributes[i].name, "XV_HUE") &&
-                         (!strcasecmp(name, "hue")))
+                         (!av_strcasecmp(name, "hue")))
                 {
                     port_value = value;
                     hue = 1;
                 } else
                     /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */
                 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") &&
-                        (!strcasecmp(name, "red_intensity")))
+                        (!av_strcasecmp(name, "red_intensity")))
                     port_value = value;
                 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY")
-                         && (!strcasecmp(name, "green_intensity")))
+                         && (!av_strcasecmp(name, "green_intensity")))
                     port_value = value;
                 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY")
-                         && (!strcasecmp(name, "blue_intensity")))
+                         && (!av_strcasecmp(name, "blue_intensity")))
                     port_value = value;
                 else
                     continue;
@@ -2048,16 +2048,16 @@
                     100;
 
                 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") &&
-                    (!strcasecmp(name, "brightness")))
+                    (!av_strcasecmp(name, "brightness")))
                     *value = val;
                 else if (!strcmp(attributes[i].name, "XV_CONTRAST") &&
-                         (!strcasecmp(name, "contrast")))
+                         (!av_strcasecmp(name, "contrast")))
                     *value = val;
                 else if (!strcmp(attributes[i].name, "XV_SATURATION") &&
-                         (!strcasecmp(name, "saturation")))
+                         (!av_strcasecmp(name, "saturation")))
                     *value = val;
                 else if (!strcmp(attributes[i].name, "XV_HUE") &&
-                         (!strcasecmp(name, "hue")))
+                         (!av_strcasecmp(name, "hue")))
                 {
                     /* nasty nvidia detect */
                     if (port_min == 0 && port_max == 360)
@@ -2067,13 +2067,13 @@
                 } else
                     /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */
                 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") &&
-                        (!strcasecmp(name, "red_intensity")))
+                        (!av_strcasecmp(name, "red_intensity")))
                     *value = val;
                 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY")
-                         && (!strcasecmp(name, "green_intensity")))
+                         && (!av_strcasecmp(name, "green_intensity")))
                     *value = val;
                 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY")
-                         && (!strcasecmp(name, "blue_intensity")))
+                         && (!av_strcasecmp(name, "blue_intensity")))
                     *value = val;
                 else
                     continue;

MPlayer-1.2.r38170.tar.xz/loader/dshow/DS_VideoDecoder.c -> MPlayer-1.2.r38304.tar.xz/loader/dshow/DS_VideoDecoder.c Changed

@@ -5,6 +5,7 @@
 
 *********************************************************/
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "guids.h"
 #include "interfaces.h"
 #include "loader/registry.h"
@@ -44,7 +45,6 @@
 #endif
 #include <stdio.h>
 #include <stdlib.h>  // labs
-#include <strings.h>
 
 // strcmp((const char*)info.dll,...)  is used instead of  (... == ...)
 // so Arpi could use char* pointer in his simplified DS_VideoDecoder class
@@ -762,15 +762,15 @@
 	    printf("No such interface\n");
 	    return -1;
 	}
-	if (strcasecmp(name, "Postprocessing") == 0)
+	if (av_strcasecmp(name, "Postprocessing") == 0)
 	    pIDivx->vt->put_PPLevel(pIDivx, value * 10);
-	else if (strcasecmp(name, "Brightness") == 0)
+	else if (av_strcasecmp(name, "Brightness") == 0)
 	    pIDivx->vt->put_Brightness(pIDivx, value);
-	else if (strcasecmp(name, "Contrast") == 0)
+	else if (av_strcasecmp(name, "Contrast") == 0)
 	    pIDivx->vt->put_Contrast(pIDivx, value);
-	else if (strcasecmp(name, "Saturation") == 0)
+	else if (av_strcasecmp(name, "Saturation") == 0)
 	    pIDivx->vt->put_Saturation(pIDivx, value);
-	else if (strcasecmp(name, "MaxAuto") == 0)
+	else if (av_strcasecmp(name, "MaxAuto") == 0)
             this->m_iMaxAuto = value;
 	pIDivx->vt->Release((IUnknown*)pIDivx);
 	//printf("Set %s  %d\n", name, value);
@@ -796,20 +796,20 @@
 	// get6=set5 23
     	hidden = (IHidden*)((int)this->m_pDS_Filter->m_pFilter + 0xb8);
 	//printf("DS_SetValue for DIVX, name=%s  value=%d\n",name,value);
-	if (strcasecmp(name, "Quality") == 0)
+	if (av_strcasecmp(name, "Quality") == 0)
 	{
             this->m_iLastQuality = value;
 	    return hidden->vt->SetSmth(hidden, value, 0);
 	}
-	if (strcasecmp(name, "Brightness") == 0)
+	if (av_strcasecmp(name, "Brightness") == 0)
 	    return hidden->vt->SetSmth2(hidden, value, 0);
-	if (strcasecmp(name, "Contrast") == 0)
+	if (av_strcasecmp(name, "Contrast") == 0)
 	    return hidden->vt->SetSmth3(hidden, value, 0);
-	if (strcasecmp(name, "Saturation") == 0)
+	if (av_strcasecmp(name, "Saturation") == 0)
 	    return hidden->vt->SetSmth4(hidden, value, 0);
-	if (strcasecmp(name, "Hue") == 0)
+	if (av_strcasecmp(name, "Hue") == 0)
 	    return hidden->vt->SetSmth5(hidden, value, 0);
-	if (strcasecmp(name, "MaxAuto") == 0)
+	if (av_strcasecmp(name, "MaxAuto") == 0)
 	{
             this->m_iMaxAuto = value;
 	}
@@ -863,7 +863,7 @@
 
 int DS_SetAttr_DivX(char* attribute, int value){
     int result, status, newkey;
-        if(strcasecmp(attribute, "Quality")==0){
+        if(av_strcasecmp(attribute, "Quality")==0){
 	    char* keyname="SOFTWARE\\Microsoft\\Scrunch";
     	    result=RegCreateKeyExA(HKEY_CURRENT_USER, keyname, 0, 0, 0, 0, 0,	   		&newkey, &status);
             if(result!=0)
@@ -889,10 +889,10 @@
 	}
 
         if(
-	(strcasecmp(attribute, "Saturation")==0) ||
-	(strcasecmp(attribute, "Hue")==0) ||
-	(strcasecmp(attribute, "Contrast")==0) ||
-	(strcasecmp(attribute, "Brightness")==0)
+	(av_strcasecmp(attribute, "Saturation")==0) ||
+	(av_strcasecmp(attribute, "Hue")==0) ||
+	(av_strcasecmp(attribute, "Contrast")==0) ||
+	(av_strcasecmp(attribute, "Brightness")==0)
 	)
         {
 	    char* keyname="SOFTWARE\\Microsoft\\Scrunch\\Video";

MPlayer-1.2.r38170.tar.xz/loader/dshow/guids.h -> MPlayer-1.2.r38304.tar.xz/loader/dshow/guids.h Changed

MPlayer-1.2.r38170.tar.xz/loader/dshow/mediatype.h -> MPlayer-1.2.r38304.tar.xz/loader/dshow/mediatype.h Changed

MPlayer-1.2.r38170.tar.xz/loader/ext.c -> MPlayer-1.2.r38304.tar.xz/loader/ext.c Changed

MPlayer-1.2.r38170.tar.xz/loader/qtx/qtxsdk/components.h -> MPlayer-1.2.r38304.tar.xz/loader/qtx/qtxsdk/components.h Changed

@@ -3,6 +3,8 @@
 
 #include <inttypes.h>
 
+#include "mppacked.h"
+
 // Basic types:
 
 typedef char *                          Ptr;
@@ -39,99 +41,121 @@
 
 //==================== COMPONENTS ===========================
 
-struct __attribute__((__packed__)) ComponentParameters {
+MP_PACKED(
+struct, ComponentParameters {
     UInt8                           flags;                      /* call modifiers: sync/async, deferred, immed, etc */
     UInt8                           paramSize;                  /* size in bytes of actual parameters passed to this call */
     short                           what;                       /* routine selector, negative for Component management calls */
     int32_t                         params[1];                  /* actual parameters for the indicated routine */
 };
+)
 typedef struct ComponentParameters      ComponentParameters;
 
 
-struct __attribute__((__packed__)) ComponentDescription {
+MP_PACKED(
+struct, ComponentDescription {
     OSType                          componentType;              /* A unique 4-byte code indentifying the command set */
     OSType                          componentSubType;           /* Particular flavor of this instance */
     OSType                          componentManufacturer;      /* Vendor indentification */
     uint32_t                        componentFlags;             /* 8 each for Component,Type,SubType,Manuf/revision */
     uint32_t                        componentFlagsMask;         /* Mask for specifying which flags to consider in search, zero during registration */
 };
+)
 typedef struct ComponentDescription     ComponentDescription;
 
 
-struct __attribute__((__packed__)) ResourceSpec {
+MP_PACKED(
+struct, ResourceSpec {
     OSType                          resType;                    /* 4-byte code    */
     short                           resID;                      /*         */
 };
+)
 typedef struct ResourceSpec             ResourceSpec;
 
 
-struct __attribute__((__packed__)) ComponentResource {
+MP_PACKED(
+struct, ComponentResource {
     ComponentDescription            cd;                         /* Registration parameters */
     ResourceSpec                    component;                  /* resource where Component code is found */
     ResourceSpec                    componentName;              /* name string resource */
     ResourceSpec                    componentInfo;              /* info string resource */
     ResourceSpec                    componentIcon;              /* icon resource */
 };
+)
 typedef struct ComponentResource        ComponentResource;
 typedef ComponentResource *             ComponentResourcePtr;
 typedef ComponentResourcePtr *          ComponentResourceHandle;
 
 
-struct __attribute__((__packed__)) ComponentRecord {
+MP_PACKED(
+struct, ComponentRecord {
     int32_t                            data[1];
 };
+)
 typedef struct ComponentRecord          ComponentRecord;
 typedef ComponentRecord *               Component;
 
 
-struct __attribute__((__packed__)) ComponentInstanceRecord {
+MP_PACKED(
+struct, ComponentInstanceRecord {
     int32_t                            data[1];
 };
+)
 typedef struct ComponentInstanceRecord  ComponentInstanceRecord;
 
 typedef ComponentInstanceRecord *       ComponentInstance;
 
 // ========================= QUICKDRAW =========================
 
-struct __attribute__((__packed__)) Rect {
+MP_PACKED(
+struct, Rect {
     short                           top;
     short                           left;
     short                           bottom;
     short                           right;
 };
+)
 typedef struct Rect                     Rect;
 typedef Rect *                          RectPtr;
 
-struct __attribute__((__packed__)) RGBColor {
+MP_PACKED(
+struct, RGBColor {
     unsigned short                  red;                        /*magnitude of red component*/
     unsigned short                  green;                      /*magnitude of green component*/
     unsigned short                  blue;                       /*magnitude of blue component*/
 };
+)
 typedef struct RGBColor                 RGBColor;
 typedef RGBColor *                      RGBColorPtr;
 typedef RGBColorPtr *                   RGBColorHdl;
 
-struct __attribute__((__packed__)) ColorSpec {
+MP_PACKED(
+struct, ColorSpec {
     short                           value;                      /*index or other value*/
     RGBColor                        rgb;                        /*true color*/
 };
+)
 typedef struct ColorSpec                ColorSpec;
 typedef ColorSpec *                     ColorSpecPtr;
 typedef ColorSpec                       CSpecArray[1];
 
-struct __attribute__((__packed__)) ColorTable {
+MP_PACKED(
+struct, ColorTable {
     int32_t                         ctSeed;                     /*unique identifier for table*/
     short                           ctFlags;                    /*high bit: 0 = PixMap; 1 = device*/
     short                           ctSize;                     /*number of entries in CTTable*/
     CSpecArray                      ctTable;                    /*array [0..0] of ColorSpec*/
 };
+)
 typedef struct ColorTable               ColorTable;
 typedef ColorTable *                    CTabPtr;
 typedef CTabPtr *                       CTabHandle;
 
-struct __attribute__((__packed__)) MatrixRecord {
+MP_PACKED(
+struct, MatrixRecord {
     Fixed                           matrix[3][3];
 };
+)
 typedef struct MatrixRecord             MatrixRecord;
 typedef MatrixRecord *                  MatrixRecordPtr;
 
@@ -140,7 +164,8 @@
 typedef unsigned short                  CodecFlags;
 typedef uint32_t                        CodecQ;
 
-struct __attribute__((__packed__)) ImageDescription {
+MP_PACKED(
+struct, ImageDescription {
     int32_t                         idSize;                     /* total size of ImageDescription including extra data ( CLUTs and other per sequence data ) */
     CodecType                       cType;                      /* what kind of codec compressed this data */
     int32_t                         resvd1;                     /* reserved for Apple use */
@@ -161,6 +186,7 @@
     short                           depth;                      /* what depth is this data (1-32) or ( 33-40 grayscale ) */
     short                           clutID;                     /* clut id or if 0 clut follows  or -1 if no clut */
 };
+)
 typedef struct ImageDescription         ImageDescription;
 typedef ImageDescription *              ImageDescriptionPtr;
 typedef ImageDescriptionPtr *           ImageDescriptionHandle;
@@ -185,7 +211,8 @@
     k2vuyPixelFormat            = FOUR_CHAR_CODE('2','v','u','y')        /* UYVY 4:2:2 byte ordering   16*/
 };
 
-struct __attribute__((__packed__)) PixMapExtension {
+MP_PACKED(
+struct, PixMapExtension {
     int32_t                         extSize;                    /*size of struct, duh!*/
     uint32_t                        pmBits;                     /*pixmap attributes bitfield*/
     void *                          pmGD;                       /*this is a GDHandle*/
@@ -197,13 +224,15 @@
     uint32_t                        signature;
     Handle                          baseAddrHandle;
 };
+)
 typedef struct PixMapExtension          PixMapExtension;
 
 typedef PixMapExtension *               PixMapExtPtr;
 typedef PixMapExtPtr *                  PixMapExtHandle;
 
 
-struct __attribute__((__packed__)) PixMap {
+MP_PACKED(
+struct, PixMap {
     Ptr                             baseAddr;                   /*pointer to pixels*/
     short                           rowBytes;                   /*offset to next line*/
     Rect                            bounds;                     /*encloses bitmap*/
@@ -220,16 +249,19 @@
     CTabHandle                      pmTable;                    /*color map for this pixMap*/
     PixMapExtHandle                 pmExt;                      /*Handle to pixMap extension*/
 };
+)
 typedef struct PixMap                   PixMap;
 typedef PixMap *                        PixMapPtr;
 typedef PixMapPtr *                     PixMapHandle;
 
 
-struct __attribute__((__packed__)) BitMap {
+MP_PACKED(
+struct, BitMap {

MPlayer-1.2.r38170.tar.xz/loader/win32.c -> MPlayer-1.2.r38304.tar.xz/loader/win32.c Changed

@@ -55,7 +55,6 @@
 #include "path.h"
 
 #include <stdlib.h>
-#include <strings.h>
 #include <assert.h>
 #include <stdarg.h>
 #include <ctype.h>
@@ -82,6 +81,7 @@
 #include "osdep/mmap.h"
 #endif
 #include "osdep/mmap_anon.h"
+#include "libavutil/mem.h"
 #include "libavutil/avstring.h"
 #include "cpudetect.h"
 
@@ -351,7 +351,7 @@
 void* mreq_private(int size, int to_zero, int type)
 {
     int nsize = size + sizeof(alloc_header);
-    alloc_header* header = memalign(16, nsize);
+    alloc_header* header = av_malloc(nsize);
     if (!header)
         return 0;
     if (to_zero)
@@ -436,7 +436,7 @@
 	return 0;
 #endif
     //memset(header + 1, 0xcc, header->size);
-    free(header);
+    av_free(header);
     return 0;
 }
 #endif
@@ -586,10 +586,10 @@
     }
     if(!result)
     {
-	if(name && (strcasecmp(name, "kernel32")==0 || !strcasecmp(name, "kernel32.dll")))
+	if(name && (av_strcasecmp(name, "kernel32")==0 || !av_strcasecmp(name, "kernel32.dll")))
 	    result=MODULE_HANDLE_kernel32;
 #ifdef CONFIG_QTX_CODECS
-	if(name && strcasecmp(name, "user32")==0)
+	if(name && av_strcasecmp(name, "user32")==0)
 	    result=MODULE_HANDLE_user32;
 #endif
     }
@@ -2146,7 +2146,7 @@
 	    if ((s=strchr(value,'\n')))
 		*s='\0';
 
-	    if (!strncasecmp(line, "cpu MHz",strlen("cpu MHz"))
+	    if (!av_strncasecmp(line, "cpu MHz",strlen("cpu MHz"))
 		&& sscanf(value, "%lf", &freq) == 1) {
 		freq*=1000;
 		break;
@@ -2531,33 +2531,33 @@
     dbgprintf("Entering LoadLibraryA(%s)\n", name);
 
     // PIMJ and VIVO audio are loading  kernel32.dll
-    if (strcasecmp(name, "kernel32.dll") == 0 || strcasecmp(name, "kernel32") == 0)
+    if (av_strcasecmp(name, "kernel32.dll") == 0 || av_strcasecmp(name, "kernel32") == 0)
 	return MODULE_HANDLE_kernel32;
 //	return ERROR_SUCCESS; /* yeah, we have also the kernel32 calls */
 			      /* exported -> do not return failed! */
 
-    if (strcasecmp(name, "user32.dll") == 0 || strcasecmp(name, "user32") == 0)
+    if (av_strcasecmp(name, "user32.dll") == 0 || av_strcasecmp(name, "user32") == 0)
 //	return MODULE_HANDLE_kernel32;
 	return MODULE_HANDLE_user32;
 
 #ifdef CONFIG_QTX_CODECS
-    if (strcasecmp(name, "wininet.dll") == 0 || strcasecmp(name, "wininet") == 0)
+    if (av_strcasecmp(name, "wininet.dll") == 0 || av_strcasecmp(name, "wininet") == 0)
 	return MODULE_HANDLE_wininet;
-    if (strcasecmp(name, "ddraw.dll") == 0 || strcasecmp(name, "ddraw") == 0)
+    if (av_strcasecmp(name, "ddraw.dll") == 0 || av_strcasecmp(name, "ddraw") == 0)
 	return MODULE_HANDLE_ddraw;
-    if (strcasecmp(name, "advapi32.dll") == 0 || strcasecmp(name, "advapi32") == 0)
+    if (av_strcasecmp(name, "advapi32.dll") == 0 || av_strcasecmp(name, "advapi32") == 0)
 	return MODULE_HANDLE_advapi32;
 #endif
 
-    if (strcasecmp(name, "comdlg32.dll") == 0 || strcasecmp(name, "comdlg32") == 0)
+    if (av_strcasecmp(name, "comdlg32.dll") == 0 || av_strcasecmp(name, "comdlg32") == 0)
 	return MODULE_HANDLE_comdlg32;
-    if (strcasecmp(name, "msvcrt.dll") == 0 || strcasecmp(name, "msvcrt") == 0)
+    if (av_strcasecmp(name, "msvcrt.dll") == 0 || av_strcasecmp(name, "msvcrt") == 0)
 	return MODULE_HANDLE_msvcrt;
-    if (strcasecmp(name, "ole32.dll") == 0 || strcasecmp(name, "ole32") == 0)
+    if (av_strcasecmp(name, "ole32.dll") == 0 || av_strcasecmp(name, "ole32") == 0)
 	return MODULE_HANDLE_ole32;
-    if (strcasecmp(name, "winmm.dll") == 0 || strcasecmp(name, "winmm") == 0)
+    if (av_strcasecmp(name, "winmm.dll") == 0 || av_strcasecmp(name, "winmm") == 0)
 	return MODULE_HANDLE_winmm;
-    if (strcasecmp(name, "psapi.dll") == 0 || strcasecmp(name, "psapi") == 0)
+    if (av_strcasecmp(name, "psapi.dll") == 0 || av_strcasecmp(name, "psapi") == 0)
 	return MODULE_HANDLE_psapi;
 
     result=LoadLibraryA(name);
@@ -3954,7 +3954,7 @@
 
 static LONG WINAPI explstrcmpiA(const char* str1, const char* str2)
 {
-    LONG result=strcasecmp(str1, str2);
+    LONG result=av_strcasecmp(str1, str2);
     dbgprintf("strcmpi(0x%x='%s', 0x%x='%s') => %d\n", str1, str1, str2, str2, result);
     return result;
 }
@@ -4614,7 +4614,7 @@
 
 static int exp_stricmp(const char* s1, const char* s2)
 {
-    return strcasecmp(s1, s2);
+    return av_strcasecmp(s1, s2);
 }
 
 static uint64_t exp_time64(void)
@@ -5747,7 +5747,7 @@
 
     for(i=0; i<sizeof(libraries)/sizeof(struct libs); i++)
     {
-	if(strcasecmp(library, libraries[i].name))
+	if(av_strcasecmp(library, libraries[i].name))
 	    continue;
 	for(j=0; j<libraries[i].length; j++)
 	{
@@ -5814,7 +5814,7 @@
     dbgprintf("External func %s:%s\n", library, name);
     for(i=0; i<sizeof(libraries)/sizeof(struct libs); i++)
     {
-	if(strcasecmp(library, libraries[i].name))
+	if(av_strcasecmp(library, libraries[i].name))
 	    continue;
 	for(j=0; j<libraries[i].length; j++)
 	{

MPlayer-1.2.r38170.tar.xz/loader/wine/winestring.h -> MPlayer-1.2.r38304.tar.xz/loader/wine/winestring.h Changed

MPlayer-1.2.r38170.tar.xz/m_config.c -> MPlayer-1.2.r38304.tar.xz/m_config.c Changed

@@ -25,11 +25,12 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <strings.h>
 #ifdef MP_DEBUG
 #include <assert.h>
 #endif
 
+#include "libavutil/common.h"
+#include "libavutil/avstring.h"
 #include "m_config.h"
 #include "m_option.h"
 #include "mp_msg.h"
@@ -110,10 +111,9 @@
                p->desc ? p->desc : "");
     config->profile_depth++;
     for (i = 0; i < p->num_opts; i++) {
-        char spc[config->profile_depth + 1];
-        for (j = 0; j < config->profile_depth; j++)
-            spc[j] = ' ';
-        spc[config->profile_depth] = '\0';
+        char spc[MAX_PROFILE_DEPTH + 1];
+        memset(spc, ' ', MAX_PROFILE_DEPTH);
+        spc[FFMIN(config->profile_depth, MAX_PROFILE_DEPTH)] = '\0';
 
         mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s%s=%s\n", spc,
                p->opts[2 * i], p->opts[2 * i + 1]);
@@ -123,12 +123,11 @@
             char *e, *list = p->opts[2 * i + 1];
             while ((e = strchr(list, ','))) {
                 int l = e-list;
-                char tmp[l+1];
                 if (!l)
                     continue;
-                memcpy(tmp, list, l);
-                tmp[l] = '\0';
+                char *tmp = av_strndup(list, l);
                 show_profile(opt, name, tmp);
+                av_freep(&tmp);
                 list = e+1;
             }
             if (list[0] != '\0')
@@ -390,9 +389,9 @@
     int l = strlen(co->name) - 1;
     if((co->opt->type->flags & M_OPT_TYPE_ALLOW_WILDCARD) &&
        (co->name[l] == '*')) {
-      if(strncasecmp(co->name,arg,l) == 0)
+      if(av_strncasecmp(co->name,arg,l) == 0)
 	return co;
-    } else if(strcasecmp(co->name,arg) == 0)
+    } else if(av_strcasecmp(co->name,arg) == 0)
       return co;
   }
   return NULL;
@@ -449,9 +448,9 @@
       int l = strlen(co->name) + 1 + strlen(lst[2*i]) + 1;
       if(r >= 0) {
 	// Build the full name
-	char n[l];
-	sprintf(n,"%s:%s",co->name,lst[2*i]);
+	char *n = av_asprintf("%s:%s",co->name,lst[2*i]);
 	sr = m_config_parse_option(config,n,lst[2*i+1],set);
+	av_freep(&n);
 	if(sr < 0){
 	  if(sr == M_OPT_UNKNOWN){
 	    mp_msg(MSGT_CFGPARSER, MSGL_ERR,MSGTR_InvalidSuboption,co->name,lst[2*i]);

MPlayer-1.2.r38170.tar.xz/m_config.h -> MPlayer-1.2.r38304.tar.xz/m_config.h Changed

MPlayer-1.2.r38170.tar.xz/m_option.c -> MPlayer-1.2.r38304.tar.xz/m_option.c Changed

@@ -23,12 +23,12 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <inttypes.h>
 #include <unistd.h>
+#include <sys/types.h>
 
 #include "m_option.h"
 //#include "m_config.h"
@@ -37,6 +37,7 @@
 #include "stream/url.h"
 #include "libavutil/avstring.h"
 #include "libavutil/attributes.h"
+#include "libavutil/mem.h"
 
 // Don't free for 'production' atm
 #ifndef MP_DEBUG
@@ -50,9 +51,9 @@
     int l = strlen(list[i].name) - 1;
     if((list[i].type->flags & M_OPT_TYPE_ALLOW_WILDCARD) &&
        (l > 0) && (list[i].name[l] == '*')) {
-      if(strncasecmp(list[i].name,name,l) == 0)
+      if(av_strncasecmp(list[i].name,name,l) == 0)
 	return &list[i];
-    } else if(strcasecmp(list[i].name,name) == 0)
+    } else if(av_strcasecmp(list[i].name,name) == 0)
       return &list[i];
   }
   return NULL;
@@ -99,28 +100,28 @@
 static int parse_flag(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
   if (src == M_CONFIG_FILE) {
     if(!param) return M_OPT_MISSING_PARAM;
-    if (!strcasecmp(param, "yes") ||	/* any other language? */
-	!strcasecmp(param, "on") ||
-	!strcasecmp(param, "ja") ||
-	!strcasecmp(param, "si") ||
-	!strcasecmp(param, "igen") ||
-	!strcasecmp(param, "y") ||
-	!strcasecmp(param, "j") ||
-	!strcasecmp(param, "i") ||
-	!strcasecmp(param, "tak") ||
-	!strcasecmp(param, "ja") ||
-	!strcasecmp(param, "true") ||
+    if (!av_strcasecmp(param, "yes") ||	/* any other language? */
+	!av_strcasecmp(param, "on") ||
+	!av_strcasecmp(param, "ja") ||
+	!av_strcasecmp(param, "si") ||
+	!av_strcasecmp(param, "igen") ||
+	!av_strcasecmp(param, "y") ||
+	!av_strcasecmp(param, "j") ||
+	!av_strcasecmp(param, "i") ||
+	!av_strcasecmp(param, "tak") ||
+	!av_strcasecmp(param, "ja") ||
+	!av_strcasecmp(param, "true") ||
 	!strcmp(param, "1")) {
       if(dst) VAL(dst) = opt->max;
-    } else if (!strcasecmp(param, "no") ||
-	       !strcasecmp(param, "off") ||
-	       !strcasecmp(param, "nein") ||
-	       !strcasecmp(param, "nicht") ||
-	       !strcasecmp(param, "nem") ||
-	       !strcasecmp(param, "n") ||
-	       !strcasecmp(param, "nie") ||
-	       !strcasecmp(param, "nej") ||
-	       !strcasecmp(param, "false") ||
+    } else if (!av_strcasecmp(param, "no") ||
+	       !av_strcasecmp(param, "off") ||
+	       !av_strcasecmp(param, "nein") ||
+	       !av_strcasecmp(param, "nicht") ||
+	       !av_strcasecmp(param, "nem") ||
+	       !av_strcasecmp(param, "n") ||
+	       !av_strcasecmp(param, "nie") ||
+	       !av_strcasecmp(param, "nej") ||
+	       !av_strcasecmp(param, "false") ||
 	       !strcmp(param, "0")) {
       if(dst) VAL(dst) = opt->min;
     } else {
@@ -569,13 +570,13 @@
 
   if(opt->name[len-1] == '*' && ((int)strlen(name) > len - 1)) {
     const char* n = &name[len-1];
-    if(strcasecmp(n,"-add") == 0)
+    if(av_strcasecmp(n,"-add") == 0)
       op = OP_ADD;
-    else if(strcasecmp(n,"-pre") == 0)
+    else if(av_strcasecmp(n,"-pre") == 0)
       op = OP_PRE;
-    else if(strcasecmp(n,"-del") == 0)
+    else if(av_strcasecmp(n,"-del") == 0)
       op = OP_DEL;
-    else if(strcasecmp(n,"-clr") == 0)
+    else if(av_strcasecmp(n,"-clr") == 0)
       op = OP_CLR;
     else
       return M_OPT_UNKNOWN;
@@ -1196,7 +1197,7 @@
   if (sscanf(param, "0x%x", &fmt) != 1)
   {
   for(i = 0 ; mp_imgfmt_list[i].name ; i++) {
-    if(!strcasecmp(param,mp_imgfmt_list[i].name)) {
+    if(!av_strcasecmp(param,mp_imgfmt_list[i].name)) {
       fmt=mp_imgfmt_list[i].fmt;
       break;
     }
@@ -1286,7 +1287,7 @@
   if (sscanf(param, "0x%x", &fmt) != 1)
   {
   for(i = 0 ; mp_afmt_list[i].name ; i++) {
-    if(!strcasecmp(param,mp_afmt_list[i].name)) {
+    if(!av_strcasecmp(param,mp_afmt_list[i].name)) {
       fmt=mp_afmt_list[i].fmt;
       break;
     }
@@ -1328,7 +1329,7 @@
     *time = 60*a + d;
   else if (sscanf(str, "%lf%n", &d, &len) >= 1)
     *time = d;
-  else if (strncasecmp(str, "nopts", 5) == 0) {
+  else if (av_strncasecmp(str, "nopts", 5) == 0) {
     *time = MP_NOPTS_VALUE;
     len = 5;
   } else
@@ -1385,13 +1386,13 @@
   /* End at size parsing */
   if(sscanf(param, "%lf%3s", &end_at, unit) == 2) {
     ts.type = END_AT_SIZE;
-    if(!strcasecmp(unit, "b"))
+    if(!av_strcasecmp(unit, "b"))
       ;
-    else if(!strcasecmp(unit, "kb"))
+    else if(!av_strcasecmp(unit, "kb"))
       end_at *= 1024;
-    else if(!strcasecmp(unit, "mb"))
+    else if(!av_strcasecmp(unit, "mb"))
       end_at *= 1024*1024;
-    else if(!strcasecmp(unit, "gb"))
+    else if(!av_strcasecmp(unit, "gb"))
       end_at *= 1024*1024*1024;
     else
       ts.type = END_AT_NONE;
@@ -1805,18 +1806,16 @@
 
   if(opt->name[len-1] == '*' && ((int)strlen(name) > len - 1)) {
     const char* n = &name[len-1];
-    if(strcasecmp(n,"-add") == 0)
+    if(av_strcasecmp(n,"-add") == 0)
       op = OP_ADD;
-    else if(strcasecmp(n,"-pre") == 0)
+    else if(av_strcasecmp(n,"-pre") == 0)
       op = OP_PRE;
-    else if(strcasecmp(n,"-del") == 0)
+    else if(av_strcasecmp(n,"-del") == 0)
       op = OP_DEL;
-    else if(strcasecmp(n,"-clr") == 0)
+    else if(av_strcasecmp(n,"-clr") == 0)
       op = OP_CLR;
     else {
-      char prefix[len];
-      strncpy(prefix,opt->name,len-1);
-      prefix[len-1] = '\0';
+      char *prefix = av_strndup(opt->name, len-1);
       mp_msg(MSGT_VFILTER,MSGL_ERR, "Option %s: unknown postfix %s\n"
 	     "Supported postfixes are:\n"
 	     "  %s-add\n"
@@ -1828,6 +1827,7 @@
 	     " Negative index can be used (i.e. -1 is the last element)\n\n"
 	     "  %s-clr\n"
 	     " Clear the current list.\n",name,n,prefix,prefix,prefix,prefix);
+      av_freep(&prefix);
 
       return M_OPT_UNKNOWN;
     }
@@ -2197,10 +2197,9 @@
       mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option %s: This URL doesn't have a hostname part.\n",name);
       // skip
     } else {
-      char tmp[pos2-pos1+1];
-      strncpy(tmp,ptr1, pos2-pos1);
-      tmp[pos2-pos1] = '\0';
+      char *tmp = av_strndup(ptr1, pos2-pos1);
       r = m_struct_set(desc,dst,"hostname",tmp);
+      av_freep(&tmp);
       if(r < 0) {
 	mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while setting hostname.\n",name);
 	return r;

MPlayer-1.2.r38170.tar.xz/m_property.c -> MPlayer-1.2.r38304.tar.xz/m_property.c Changed

@@ -27,6 +27,7 @@
 #include <inttypes.h>
 #include <unistd.h>
 
+#include "libavutil/mem.h"
 #include "m_option.h"
 #include "m_property.h"
 #include "mp_msg.h"
@@ -41,10 +42,9 @@
     int r;
     if((sep = strchr(name,'/')) && sep[1]) {
         int len = sep-name;
-        char base[len+1];
-        memcpy(base,name,len);
-        base[len] = 0;
+        char *base = av_strndup(name, len);
         prop = m_option_list_find(prop_list, base);
+        av_freep(&base);
         ka.key = sep+1;
         ka.action = action;
         ka.arg = arg;
@@ -150,29 +150,27 @@
             lvl--, str++, l = 0;
         } else if(str[0] == '$' && str[1] == '{' && (e = strchr(str+2,'}'))) {
             int pl = e-str-2;
-            char pname[pl+1];
-            memcpy(pname,str+2,pl);
-            pname[pl] = 0;
+            char *pname = av_strndup(str+2, pl);
             if(m_property_do(prop_list, pname,
                              M_PROPERTY_PRINT, &p, ctx) >= 0 && p)
                 l = strlen(p), fr = 1;
             else
                 l = 0;
+            av_freep(&pname);
             str = e+1;
         } else if(str[0] == '?' && str[1] == '(' && (e = strchr(str+2,':'))) {
             lvl++;
             if(!skip) {
                 int is_not = str[2] == '!';
                 int pl = e - str - (is_not ? 3 : 2);
-                char pname[pl+1];
-                memcpy(pname, str + (is_not ? 3 : 2), pl);
-                pname[pl] = 0;
+                char *pname = av_strndup(str + (is_not ? 3 : 2), pl);
                 if(m_property_do(prop_list,pname,M_PROPERTY_GET,NULL,ctx) < 0) {
                     if (!is_not)
                         skip = 1, skip_lvl = lvl;
                 }
                 else if (is_not)
                     skip = 1, skip_lvl = lvl;
+                av_freep(&pname);
             }
             str = e+1, l = 0;
         } else

MPlayer-1.2.r38170.tar.xz/m_struct.c -> MPlayer-1.2.r38304.tar.xz/m_struct.c Changed

MPlayer-1.2.r38170.tar.xz/mencoder.c -> MPlayer-1.2.r38304.tar.xz/mencoder.c Changed

MPlayer-1.2.r38170.tar.xz/mp_msg.c -> MPlayer-1.2.r38304.tar.xz/mp_msg.c Changed

@@ -20,9 +20,9 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <strings.h>
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "osdep/getch2.h"
 
 #ifdef CONFIG_ICONV
@@ -59,8 +59,8 @@
     size_t filename_len, max_path;
     char* precoded;
     if (!mp_msg_charset ||
-        !strcasecmp(mp_msg_charset, MSG_CHARSET) ||
-        !strcasecmp(mp_msg_charset, "noconv"))
+        !av_strcasecmp(mp_msg_charset, MSG_CHARSET) ||
+        !av_strcasecmp(mp_msg_charset, "noconv"))
         return filename;
     if (inv_msgiconv == (iconv_t)(-1)) {
         inv_msgiconv = iconv_open(MSG_CHARSET, mp_msg_charset);
@@ -216,7 +216,7 @@
     tmp[MSGSIZE_MAX-1] = 0;
 
 #if defined(CONFIG_ICONV) && defined(MSG_CHARSET)
-    if (mp_msg_charset && strcasecmp(mp_msg_charset, "noconv")) {
+    if (mp_msg_charset && av_strcasecmp(mp_msg_charset, "noconv")) {
       char tmp2[MSGSIZE_MAX];
       size_t inlen = strlen(tmp), outlen = MSGSIZE_MAX;
       char *in = tmp, *out = tmp2;

MPlayer-1.2.r38170.tar.xz/mpcommon.c -> MPlayer-1.2.r38304.tar.xz/mpcommon.c Changed

@@ -18,6 +18,7 @@
 
 #if defined(__MINGW32__) || defined(__CYGWIN__)
 #include <windows.h>
+#include <windef.h>
 #endif
 #include <stdlib.h>
 #include "stream/stream.h"
@@ -479,9 +480,9 @@
 
     HMODULE kernel32 = GetModuleHandle("Kernel32.dll");
     HMODULE shell32  = GetModuleHandle("shell32.dll");
-    int WINAPI (*wc2mb)(UINT, DWORD, LPCWSTR, int, LPSTR, int, LPCSTR, LPBOOL) = NULL;
-    LPCWSTR WINAPI (*getCmdlW)(void) = NULL;
-    LPWSTR * WINAPI (*cmdl2argv)(LPCWSTR, int *) = NULL;
+    int (WINAPI *wc2mb)(UINT, DWORD, LPCWSTR, int, LPSTR, int, LPCSTR, LPBOOL) = NULL;
+    LPCWSTR (WINAPI *getCmdlW)(void) = NULL;
+    LPWSTR *(WINAPI *cmdl2argv)(LPCWSTR, int *) = NULL;
 
     if (!kernel32 || !shell32)
         goto err_out;
@@ -541,8 +542,8 @@
 {
 #if defined(__MINGW32__) || defined(__CYGWIN__)
     HMODULE kernel32 = GetModuleHandle("Kernel32.dll");
-    BOOL WINAPI (*setDEP)(DWORD) = NULL;
-    BOOL WINAPI (*setDllDir)(LPCTSTR) = NULL;
+    BOOL (WINAPI *setDEP)(DWORD) = NULL;
+    BOOL (WINAPI *setDllDir)(LPCTSTR) = NULL;
     if (kernel32) {
         setDEP = GetProcAddress(kernel32, "SetProcessDEPPolicy");
         setDllDir = GetProcAddress(kernel32, "SetDllDirectoryA");

MPlayer-1.2.r38170.tar.xz/mplayer.c -> MPlayer-1.2.r38304.tar.xz/mplayer.c Changed

@@ -25,12 +25,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <time.h>
 #include <unistd.h>
 #include <assert.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/types.h>
 
 #if defined(__MINGW32__) || defined(__CYGWIN__)
@@ -124,8 +122,6 @@
 #include "sub/subreader.h"
 #include "sub/vobsub.h"
 #include "sub/eosd.h"
-#include "osdep/getch2.h"
-#include "osdep/timer.h"
 
 #include "udp_sync.h"
 
@@ -429,7 +425,7 @@
         return NULL;
 
     for (n = 0; info[2 * n] != NULL; n++)
-        if (!strcasecmp(info[2 * n], tag))
+        if (!av_strcasecmp(info[2 * n], tag))
             break;
 
     return info[2 * n + 1] ? strdup(info[2 * n + 1]) : NULL;
@@ -891,7 +887,7 @@
 static void load_per_protocol_config(m_config_t *conf, const char *const file)
 {
     char *str;
-    char protocol[strlen(PROFILE_CFG_PROTOCOL) + strlen(file) + 1];
+    char *protocol;
     m_profile_t *p;
 
     /* does filename actually uses a protocol ? */
@@ -899,13 +895,14 @@
     if (!str)
         return;
 
-    sprintf(protocol, "%s%s", PROFILE_CFG_PROTOCOL, file);
-    protocol[strlen(PROFILE_CFG_PROTOCOL) + strlen(file) - strlen(str)] = '\0';
+    protocol = av_asprintf("%s%s", PROFILE_CFG_PROTOCOL, file);
+    *strstr(protocol, "://") = 0;
     p = m_config_get_profile(conf, protocol);
     if (p) {
         mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingProtocolProfile, protocol);
         m_config_set_profile(conf, p);
     }
+    av_freep(&protocol);
 }
 
 #define PROFILE_CFG_EXTENSION "extension."
@@ -913,7 +910,7 @@
 static void load_per_extension_config(m_config_t *conf, const char *const file)
 {
     char *str;
-    char extension[strlen(PROFILE_CFG_EXTENSION) + 8];
+    char extension[sizeof(PROFILE_CFG_EXTENSION) + 7];
     m_profile_t *p;
 
     /* does filename actually have an extension ? */
@@ -921,8 +918,7 @@
     if (!str)
         return;
 
-    sprintf(extension, PROFILE_CFG_EXTENSION);
-    strncat(extension, ++str, 7);
+    snprintf(extension, sizeof(extension), "%s%s", PROFILE_CFG_EXTENSION, ++str);
     p = m_config_get_profile(conf, extension);
     if (p) {
         mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingExtensionProfile, extension);
@@ -935,15 +931,15 @@
 
 static void load_per_output_config(m_config_t *conf, char *cfg, char *out)
 {
-    char profile[strlen(cfg) + strlen(out) + 1];
     m_profile_t *p;
 
-    sprintf(profile, "%s%s", cfg, out);
+    char *profile = av_asprintf("%s%s", cfg, out);
     p = m_config_get_profile(conf, profile);
     if (p) {
         mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingExtensionProfile, profile);
         m_config_set_profile(conf, p);
     }
+    av_freep(&profile);
 }
 
 /**
@@ -2434,7 +2430,7 @@
     return 1;
 
 err_out:
-    mpctx->sh_video = mpctx->d_video->sh = NULL;
+    mpctx->sh_video = mpctx->sh_video->ds = NULL;
     return 0;
 }
 
@@ -3281,12 +3277,12 @@
     if (stream_dump_type == 5) {
         unsigned char buf[4096];
         int len;
-        FILE *f;
+        stream_t *os;
         current_module = "dumpstream";
         stream_reset(mpctx->stream);
         stream_seek(mpctx->stream, mpctx->stream->start_pos);
-        f = fopen(stream_dump_name, "wb");
-        if (!f) {
+        os = open_output_stream(stream_dump_name, NULL);
+        if (!os) {
             mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CantOpenDumpfile);
             exit_player(EXIT_ERROR);
         }
@@ -3303,7 +3299,7 @@
                 break;
             len = stream_read(mpctx->stream, buf, 4096);
             if (len > 0) {
-                if (fwrite(buf, len, 1, f) != 1) {
+                if (stream_write_buffer(os, buf, len) != len) {
                     mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_ErrorWritingFile, stream_dump_name);
                     exit_player(EXIT_ERROR);
                 }
@@ -3316,7 +3312,7 @@
                     break;
             }
         }
-        if (fclose(f)) {
+        if (free_stream(os)) {
             mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_ErrorWritingFile, stream_dump_name);
             exit_player(EXIT_ERROR);
         }
@@ -3484,7 +3480,7 @@
 
     // DUMP STREAMS:
     if ((stream_dump_type) && (stream_dump_type < 4)) {
-        FILE *f;
+        stream_t *os;
         demux_stream_t *ds = NULL;
         current_module = "dump";
         // select stream to dump
@@ -3513,8 +3509,8 @@
             mpctx->d_sub->id = -2;
         }
         // let's dump it!
-        f = fopen(stream_dump_name, "wb");
-        if (!f) {
+        os = open_output_stream(stream_dump_name, NULL);
+        if (!os) {
             mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CantOpenDumpfile);
             exit_player(EXIT_ERROR);
         }
@@ -3531,9 +3527,9 @@
                 break;
             if ((mpctx->demuxer->file_format == DEMUXER_TYPE_AVI || mpctx->demuxer->file_format == DEMUXER_TYPE_ASF || mpctx->demuxer->file_format == DEMUXER_TYPE_MOV)
                 && stream_dump_type == 2)
-                fwrite(&in_size, 1, 4, f);
+                stream_write_buffer(os, &in_size, 4);
             if (in_size > 0) {
-                fwrite(start, in_size, 1, f);
+                stream_write_buffer(os, start, in_size);
                 stream_dump_progress(in_size, mpctx->stream);
             }
             if (dvd_last_chapter > 0) {
@@ -3542,7 +3538,7 @@
                     break;
             }
         }
-        fclose(f);
+        free_stream(os);
         stream_dump_progress_end();
         mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CoreDumped);
         exit_player_with_rc(EXIT_EOF, 0);

MPlayer-1.2.r38304.tar.xz/mpmem.h Added

@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+#ifndef MPLAYER_MPMEM_H
+#define MPLAYER_MPMEM_H
+
+// copy of libavutil/mem_internal.h code for the
+// benefit of compiling against shared FFmpeg libs
+
+#include "config.h"
+
+#ifndef DECLARE_ALIGNED
+#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_ALIGNED(n,t,v)  t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
+#elif defined(__DJGPP__)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (FFMIN(n, 16)))) v
+    #define DECLARE_ASM_ALIGNED(n,t,v)  t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v
+#elif defined(__GNUC__) || defined(__clang__)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_ALIGNED(n,t,v)  t av_used __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
+#elif defined(_MSC_VER)
+    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
+    #define DECLARE_ASM_ALIGNED(n,t,v)  __declspec(align(n)) t v
+    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
+#else
+    #define DECLARE_ALIGNED(n,t,v)      t v
+    #define DECLARE_ASM_ALIGNED(n,t,v)  t v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t v
+#endif
+#endif
+
+// Some broken preprocessors need a second expansion
+// to be forced to tokenize __VA_ARGS__
+#define E1(x) x
+
+#define LOCAL_ALIGNED_A(a, t, v, s, o, ...)             \
+    uint8_t la_##v[sizeof(t s o) + (a)];                \
+    t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a)
+
+#define LOCAL_ALIGNED_D(a, t, v, s, o, ...)             \
+    DECLARE_ALIGNED(a, t, la_##v) s o;                  \
+    t (*v) o = la_##v
+
+#define LOCAL_ALIGNED(a, t, v, ...) LOCAL_ALIGNED_##a(t, v, __VA_ARGS__)
+
+#if HAVE_LOCAL_ALIGNED
+#   define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_D(4, t, v, __VA_ARGS__,,))
+#else
+#   define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_A(4, t, v, __VA_ARGS__,,))
+#endif
+
+#if HAVE_LOCAL_ALIGNED
+#   define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,))
+#else
+#   define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_A(8, t, v, __VA_ARGS__,,))
+#endif
+
+#if HAVE_LOCAL_ALIGNED
+#   define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,))
+#else
+#   define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_A(16, t, v, __VA_ARGS__,,))
+#endif
+
+#if HAVE_LOCAL_ALIGNED
+#   define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,))
+#else
+#   define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,))
+#endif
+
+#endif /* MPLAYER_MPMEM_H */

MPlayer-1.2.r38304.tar.xz/mppacked.h Added

@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+#ifndef MPLAYER_MPPACKED_H
+#define MPLAYER_MPPACKED_H
+
+#ifdef _MSC_VER
+// actually also works for newer gcc
+#define MP_PACKED(type, name_and_def) \
+_Pragma("pack(push, 1)") \
+type name_and_def \
+_Pragma("pack(pop)")
+#else
+#define MP_PACKED(type, name_and_def) \
+type __attribute__((packed)) name_and_def
+#endif
+
+#endif /* MPLAYER_MPPACKED_H */

MPlayer-1.2.r38170.tar.xz/osdep/mplayer.rc -> MPlayer-1.2.r38304.tar.xz/osdep/mplayer.rc Changed

MPlayer-1.2.r38170.tar.xz/osdep/priority.c -> MPlayer-1.2.r38304.tar.xz/osdep/priority.c Changed

MPlayer-1.2.r38170.tar.xz/parser-mpcmd.c -> MPlayer-1.2.r38304.tar.xz/parser-mpcmd.c Changed

@@ -24,13 +24,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
 
 #ifdef MP_DEBUG
 #include <assert.h>
 #endif
 
+#include "libavutil/avstring.h"
+
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "m_option.h"
@@ -56,7 +57,7 @@
 
   *ret = NULL;
 
-  if(strcasecmp(opt,"playlist") == 0) { // We handle playlist here
+  if(av_strcasecmp(opt,"playlist") == 0) { // We handle playlist here
     if(!param)
       return M_OPT_MISSING_PARAM;
 
@@ -159,7 +160,7 @@
 	mp_msg(MSGT_CFGPARSER, MSGL_DBG3, "this_opt = option: %s\n", opt);
 	// We handle here some specific option
 	// Loop option when it apply to a group
-	if(strcasecmp(opt,"loop") == 0 &&
+	if(av_strcasecmp(opt,"loop") == 0 &&
 		  (! last_entry || last_entry->child) ) {
 	  int l;
 	  char* end = NULL;
@@ -173,12 +174,12 @@
 	    pt->loop = l;
 	    tmp = 1;
 	  }
-	} else if(strcasecmp(opt,"shuffle") == 0) {
+	} else if(av_strcasecmp(opt,"shuffle") == 0) {
 	  if(last_entry && last_entry->child)
 	    last_entry->flags |= PLAY_TREE_RND;
 	  else
 	    last_parent->flags |= PLAY_TREE_RND;
-	} else if(strcasecmp(opt,"noshuffle") == 0) {
+	} else if(av_strcasecmp(opt,"noshuffle") == 0) {
 	  if(last_entry && last_entry->child)
 	    last_entry->flags &= ~PLAY_TREE_RND;
 	  else
@@ -269,7 +270,7 @@
 	}
 
 	// Lock stdin if it will be used as input
-	if(strcasecmp(argv[i],"-") == 0)
+	if(av_strcasecmp(argv[i],"-") == 0)
 	  m_config_set_option(config,"noconsolecontrols",NULL);
 	add_entry(&last_parent,&last_entry,entry);
 	UNSET_GLOBAL; // We start entry specific options

MPlayer-1.2.r38170.tar.xz/playtree.c -> MPlayer-1.2.r38304.tar.xz/playtree.c Changed

MPlayer-1.2.r38170.tar.xz/playtreeparser.c -> MPlayer-1.2.r38304.tar.xz/playtreeparser.c Changed

@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -32,6 +31,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <limits.h>
+#include "libavutil/avstring.h"
 #include "asxparser.h"
 #include "m_config.h"
 #include "playtree.h"
@@ -189,7 +189,7 @@
 	line += 4;
 	if(line[0] != '\0' && strlen(line) > 0)
 	  get_line = 0;
-      } else if(strncasecmp(line,"<ASX",4) == 0) // We got an asx element
+      } else if(av_strncasecmp(line,"<ASX",4) == 0) // We got an asx element
 	break;
       else // We don't get an asx
 	return NULL;
@@ -295,7 +295,7 @@
   }
   if (!line)
     return NULL;
-  if(strcasecmp(line,"[playlist]"))
+  if(av_strcasecmp(line,"[playlist]"))
     return NULL;
   mp_msg(MSGT_PLAYTREE,MSGL_V,"Detected Winamp playlist format\n");
   play_tree_parser_stop_keeping(p);
@@ -303,7 +303,7 @@
   if(!line)
     return NULL;
   strstrip(line);
-  if(strncasecmp(line,"NumberOfEntries",15) == 0) {
+  if(av_strncasecmp(line,"NumberOfEntries",15) == 0) {
     v = pls_entry_get_value(line);
     n_entries = atoi(v);
     if(n_entries < 0)
@@ -319,19 +319,19 @@
       line = play_tree_parser_get_line(p);
       continue;
     }
-    if(strncasecmp(line,"File",4) == 0) {
+    if(av_strncasecmp(line,"File",4) == 0) {
       num = pls_read_entry(line+4,&entries,&max_entry,&v);
       if(num < 0)
 	mp_msg(MSGT_PLAYTREE,MSGL_ERR,"No value in entry %s\n",line);
       else
 	entries[num-1].file = strdup(v);
-    } else if(strncasecmp(line,"Title",5) == 0) {
+    } else if(av_strncasecmp(line,"Title",5) == 0) {
       num = pls_read_entry(line+5,&entries,&max_entry,&v);
       if(num < 0)
 	mp_msg(MSGT_PLAYTREE,MSGL_ERR,"No value in entry %s\n",line);
       else
 	entries[num-1].title = strdup(v);
-    } else if(strncasecmp(line,"Length",6) == 0) {
+    } else if(av_strncasecmp(line,"Length",6) == 0) {
       num = pls_read_entry(line+6,&entries,&max_entry,&v);
       if(num < 0)
 	mp_msg(MSGT_PLAYTREE,MSGL_ERR,"No value in entry %s\n",line);
@@ -391,7 +391,7 @@
   if (!(line = play_tree_parser_get_line(p)))
     return NULL;
   strstrip(line);
-  if(strcasecmp(line,"[Reference]"))
+  if(av_strcasecmp(line,"[Reference]"))
     return NULL;
   mp_msg(MSGT_PLAYTREE,MSGL_V,"Detected reference-ini playlist format\n");
   play_tree_parser_stop_keeping(p);
@@ -400,7 +400,7 @@
     return NULL;
   while(line) {
     strstrip(line);
-    if(strncasecmp(line,"Ref",3) == 0) {
+    if(av_strncasecmp(line,"Ref",3) == 0) {
       v = pls_entry_get_value(line+3);
       if(!v)
 	mp_msg(MSGT_PLAYTREE,MSGL_ERR,"No value in entry %s\n",line);
@@ -434,7 +434,7 @@
   if (!(line = play_tree_parser_get_line(p)))
     return NULL;
   strstrip(line);
-  if(strcasecmp(line,"#EXTM3U"))
+  if(av_strcasecmp(line,"#EXTM3U"))
     return NULL;
   mp_msg(MSGT_PLAYTREE,MSGL_V,"Detected extended m3u playlist format\n");
   play_tree_parser_stop_keeping(p);
@@ -451,7 +451,7 @@
      */
     if(line[0] == '#') {
 #if 0 /* code functional */
-      if(strncasecmp(line,"#EXTINF:",8) == 0) {
+      if(av_strncasecmp(line,"#EXTINF:",8) == 0) {
         mp_msg(MSGT_PLAYTREE,MSGL_INFO,"[M3U] Duration: %dsec  Title: %s\n",
           strtol(line+8,&line,10), line+2);
       }
@@ -488,12 +488,12 @@
     strstrip(line);
     if(line[0] == '\0') // Ignore empties
       continue;
-    if (strncasecmp(line,"<?xml",5)==0) // smil in xml
+    if (av_strncasecmp(line,"<?xml",5)==0) // smil in xml
       continue;
-    if (strncasecmp(line,"<!DOCTYPE smil",13)==0) // smil in xml
+    if (av_strncasecmp(line,"<!DOCTYPE smil",13)==0) // smil in xml
       continue;
-    if (strncasecmp(line,"<smil",5)==0 || strncasecmp(line,"<?wpl",5)==0 ||
-      strncasecmp(line,"(smil-document",14)==0)
+    if (av_strncasecmp(line,"<smil",5)==0 || av_strncasecmp(line,"<?wpl",5)==0 ||
+      av_strncasecmp(line,"(smil-document",14)==0)
       break; // smil header found
     else
       return NULL; //line not smil exit
@@ -503,7 +503,7 @@
   mp_msg(MSGT_PLAYTREE,MSGL_V,"Detected smil playlist format\n");
   play_tree_parser_stop_keeping(p);
 
-  if (strncasecmp(line,"(smil-document",14)==0) {
+  if (av_strncasecmp(line,"(smil-document",14)==0) {
     mp_msg(MSGT_PLAYTREE,MSGL_V,"Special smil-over-realrtsp playlist header\n");
     is_rmsmil = 1;
     if (sscanf(line, "(smil-document (ver 1.0)(npkt %u)(ttlpkt %u", &npkt, &ttlpkt) != 2) {
@@ -563,7 +563,7 @@
    while (pos) {
     if (!entrymode) { // all entries filled so far
      while ((pos=strchr(pos, '<'))) {
-      if (strncasecmp(pos,"<video",6)==0  || strncasecmp(pos,"<audio",6)==0 || strncasecmp(pos,"<media",6)==0) {
+      if (av_strncasecmp(pos,"<video",6)==0  || av_strncasecmp(pos,"<audio",6)==0 || av_strncasecmp(pos,"<media",6)==0) {
           entrymode=1;
           break; // Got a valid tag, exit '<' search loop
       }
@@ -754,7 +754,7 @@
     strstrip(line);
     if(!line[0]) // Ignore empties
       continue;
-    if (strncasecmp(line,"[Address]", 9) == 0)
+    if (av_strncasecmp(line,"[Address]", 9) == 0)
       break; // nsc header found
     else
       return NULL;
@@ -765,19 +765,19 @@
     strstrip(line);
     if (!line[0])
       continue;
-    if (strncasecmp(line, "Unicast URL=", 12) == 0) {
+    if (av_strncasecmp(line, "Unicast URL=", 12) == 0) {
       int len = decode_nsc_base64(&line[12], &unicast_url);
       if (len <= 0)
         mp_msg(MSGT_PLAYTREE, MSGL_WARN, "[nsc] Unsupported Unicast URL encoding\n");
       else
         utf16_to_ascii(unicast_url, len);
-    } else if (strncasecmp(line, "IP Address=", 11) == 0) {
+    } else if (av_strncasecmp(line, "IP Address=", 11) == 0) {
       int len = decode_nsc_base64(&line[11], &addr);
       if (len <= 0)
         mp_msg(MSGT_PLAYTREE, MSGL_WARN, "[nsc] Unsupported IP Address encoding\n");
       else
         utf16_to_ascii(addr, len);
-    } else if (strncasecmp(line, "IP Port=", 8) == 0) {
+    } else if (av_strncasecmp(line, "IP Port=", 8) == 0) {
       port = strtol(&line[8], NULL, 0);
     }
   }

MPlayer-1.2.r38170.tar.xz/stream/asf_streaming.c -> MPlayer-1.2.r38304.tar.xz/stream/asf_streaming.c Changed

@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
@@ -43,6 +42,7 @@
 #include "network.h"
 #include "tcp.h"
 
+#include "libavutil/avstring.h"
 #include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
 
@@ -78,7 +78,7 @@
     int port = stream->streaming_ctrl->url->port;
 
     //Is protocol mms or mmst?
-    if (!strcasecmp(proto, "mmst") || !strcasecmp(proto, "mms"))
+    if (!av_strcasecmp(proto, "mmst") || !av_strcasecmp(proto, "mms"))
     {
 		mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/TCP...\n");
 		fd = asf_mmst_streaming_start( stream );
@@ -89,9 +89,9 @@
 	}
 
     //Is protocol http, http_proxy, or mms?
-    if (!strcasecmp(proto, "http_proxy") || !strcasecmp(proto, "http") ||
-	!strcasecmp(proto, "mms") || !strcasecmp(proto, "mmsh") ||
-	!strcasecmp(proto, "mmshttp"))
+    if (!av_strcasecmp(proto, "http_proxy") || !av_strcasecmp(proto, "http") ||
+	!av_strcasecmp(proto, "mms") || !av_strcasecmp(proto, "mmsh") ||
+	!av_strcasecmp(proto, "mmshttp"))
     {
 		mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/HTTP...\n");
 		fd = asf_http_streaming_start( stream, demuxer_type );
@@ -470,11 +470,11 @@
 
 static int asf_http_streaming_type(char *content_type, char *features, HTTP_header_t *http_hdr ) {
 	if( content_type==NULL ) return ASF_Unknown_e;
-	if( 	!strcasecmp(content_type, "application/octet-stream") ||
-		!strcasecmp(content_type, "application/vnd.ms.wms-hdr.asfv1") ||        // New in Corona, first request
-		!strcasecmp(content_type, "application/x-mms-framed") ||                // New in Corana, second request
-		!strcasecmp(content_type, "video/x-ms-wmv") ||
-		!strcasecmp(content_type, "video/x-ms-asf")) {
+	if( 	!av_strcasecmp(content_type, "application/octet-stream") ||
+		!av_strcasecmp(content_type, "application/vnd.ms.wms-hdr.asfv1") ||        // New in Corona, first request
+		!av_strcasecmp(content_type, "application/x-mms-framed") ||                // New in Corana, second request
+		!av_strcasecmp(content_type, "video/x-ms-wmv") ||
+		!av_strcasecmp(content_type, "video/x-ms-asf")) {
 
 		if( strstr(features, "broadcast") ) {
 			mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Live stream\n");
@@ -492,7 +492,7 @@
 			if( asf_header_check( http_hdr )==0 ) {
 				mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Plain text\n");
 				return ASF_PlainText_e;
-			} else if( (!strcasecmp(content_type, "text/html")) ) {
+			} else if( (!av_strcasecmp(content_type, "text/html")) ) {
 				mp_msg(MSGT_NETWORK,MSGL_V,"=====> HTML, MPlayer is not a browser...yet!\n");
 				return ASF_Unknown_e;
 			} else {
@@ -500,15 +500,15 @@
 				return ASF_Redirector_e;
 			}
 		} else {
-			if(	(!strcasecmp(content_type, "audio/x-ms-wax")) ||
-				(!strcasecmp(content_type, "audio/x-ms-wma")) ||
-				(!strcasecmp(content_type, "video/x-ms-asf")) ||
-				(!strcasecmp(content_type, "video/x-ms-afs")) ||
-				(!strcasecmp(content_type, "video/x-ms-wmv")) ||
-				(!strcasecmp(content_type, "video/x-ms-wma")) ) {
+			if(	(!av_strcasecmp(content_type, "audio/x-ms-wax")) ||
+				(!av_strcasecmp(content_type, "audio/x-ms-wma")) ||
+				(!av_strcasecmp(content_type, "video/x-ms-asf")) ||
+				(!av_strcasecmp(content_type, "video/x-ms-afs")) ||
+				(!av_strcasecmp(content_type, "video/x-ms-wmv")) ||
+				(!av_strcasecmp(content_type, "video/x-ms-wma")) ) {
 				mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ASFRedirector);
 				return ASF_Redirector_e;
-			} else if( !strcasecmp(content_type, "text/plain") ) {
+			} else if( !av_strcasecmp(content_type, "text/plain") ) {
 				mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Plain text\n");
 				return ASF_PlainText_e;
 			} else {
@@ -545,7 +545,7 @@
 	http_add_basic_authentication( http_hdr, url->username, url->password );
 
 	// Check if we are using a proxy
-	if( !strcasecmp( url->protocol, "http_proxy" ) ) {
+	if( !av_strcasecmp( url->protocol, "http_proxy" ) ) {
 		server_url = url_new( (url->file)+1 );
 		if( server_url==NULL ) {
 			mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_InvalidProxyURL);
@@ -647,7 +647,7 @@
 		// The pragma line can get severals attributes
 		// separeted with a comma ','.
 		do {
-			if( !strncasecmp( pragma, "features=", 9) ) {
+			if( !av_strncasecmp( pragma, "features=", 9) ) {
 				pragma += 9;
 				end = strstr( pragma, "," );
 				if( end==NULL ) {
@@ -700,7 +700,7 @@
 		done = 1;
 		if( fd>0 ) closesocket( fd );
 
-		if( !strcasecmp( url->protocol, "http_proxy" ) ) {
+		if( !av_strcasecmp( url->protocol, "http_proxy" ) ) {
 			if( url->port==0 ) url->port = 8080;
 		} else {
 			if( url->port==0 ) url->port = 80;

MPlayer-1.2.r38170.tar.xz/stream/cache2.c -> MPlayer-1.2.r38304.tar.xz/stream/cache2.c Changed

MPlayer-1.2.r38170.tar.xz/stream/cookies.c -> MPlayer-1.2.r38304.tar.xz/stream/cookies.c Changed

MPlayer-1.2.r38170.tar.xz/stream/freesdp/common.h -> MPlayer-1.2.r38304.tar.xz/stream/freesdp/common.h Changed

MPlayer-1.2.r38170.tar.xz/stream/freesdp/parser.c -> MPlayer-1.2.r38304.tar.xz/stream/freesdp/parser.c Changed

MPlayer-1.2.r38170.tar.xz/stream/frequencies.c -> MPlayer-1.2.r38304.tar.xz/stream/frequencies.c Changed

MPlayer-1.2.r38170.tar.xz/stream/http.c -> MPlayer-1.2.r38304.tar.xz/stream/http.c Changed

@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 
 #if !HAVE_WINSOCK2_H
@@ -43,6 +42,7 @@
 #include "network.h"
 #include "help_mp.h"
 
+#include "libavutil/avstring.h"
 #include "libavutil/base64.h"
 
 typedef struct {
@@ -187,7 +187,7 @@
   int metaint;
   scast_data_t *scast_data;
   HTTP_header_t *http_hdr = stream->streaming_ctrl->data;
-  int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
+  int is_ultravox = av_strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
   if (!stream || stream->fd < 0 || !http_hdr)
     return -1;
   if (is_ultravox)
@@ -378,7 +378,7 @@
 	}
 	strncpy( http_hdr->protocol, http_hdr->buffer, len );
 	http_hdr->protocol[len]='\0';
-	if( !strncasecmp( http_hdr->protocol, "HTTP", 4) ) {
+	if( !av_strncasecmp( http_hdr->protocol, "HTTP", 4) ) {
 		if( sscanf( http_hdr->protocol+5,"1.%d", &(http_hdr->http_minor_version) )!=1 ) {
 			mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. Unable to get HTTP minor version.\n");
 			return -1;
@@ -435,7 +435,7 @@
 			hdr_sep_len = 0;
 			break;
 		}
-		if (len > 16 && !strncasecmp(hdr_ptr + 4, "icy-metaint:", 12))
+		if (len > 16 && !av_strncasecmp(hdr_ptr + 4, "icy-metaint:", 12))
 		{
 			mp_msg(MSGT_NETWORK, MSGL_WARN, "Server sent a severely broken icy-metaint HTTP header!\n");
 			hdr_ptr += 4;
@@ -545,7 +545,7 @@
 	while( field!=NULL ) {
 		ptr = strstr( field->field_name, ":" );
 		if( ptr==NULL ) return NULL;
-		if( !strncasecmp( field->field_name, http_hdr->field_search, ptr-(field->field_name) ) ) {
+		if( !av_strncasecmp( field->field_name, http_hdr->field_search, ptr-(field->field_name) ) ) {
 			ptr++;	// Skip the column
 			while( ptr[0]==' ' ) ptr++; // Skip the spaces if there is some
 			http_hdr->field_search_pos = field->next;
@@ -756,7 +756,7 @@
 		print_icy_metadata(http_hdr);
 
 		// Check if the response is an ICY status_code reason_phrase
-		if( !strcasecmp(http_hdr->protocol, "ICY") ||
+		if( !av_strcasecmp(http_hdr->protocol, "ICY") ||
 		     http_get_field(http_hdr, "Icy-MetaInt") ) {
 			switch( http_hdr->status_code ) {
 				case 200: { // OK
@@ -807,7 +807,7 @@
 					mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", content_type );
 					// Check in the mime type table for a demuxer type
 					for (i = 0; mime_type_table[i].mime_type != NULL; i++) {
-						if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) {
+						if( !av_strcasecmp( content_type, mime_type_table[i].mime_type ) ) {
 							*file_format = mime_type_table[i].demuxer_type;
 							res = seekable;
 							goto out;
@@ -826,7 +826,7 @@
 				// TODO: RFC 2616, recommand to detect infinite redirection loops
 				next_url = http_get_field( http_hdr, "Location" );
 				if( next_url!=NULL ) {
-					int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
+					int is_ultravox = av_strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
 					stream->streaming_ctrl->url = url_redirect( &url, next_url );
 					if (url_is_protocol(url, "https") || url_is_protocol(url, "mms")) {
 						res = STREAM_REDIRECTED;
@@ -866,7 +866,7 @@
 static int fixup_open(stream_t *stream,int seekable) {
 	HTTP_header_t *http_hdr = stream->streaming_ctrl->data;
 	int is_icy = http_hdr && http_get_field(http_hdr, "Icy-MetaInt");
-	int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
+	int is_ultravox = av_strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
 
 	stream->type = STREAMTYPE_STREAM;
 	if(!is_icy && !is_ultravox && seekable)

MPlayer-1.2.r38170.tar.xz/stream/librtsp/rtsp.c -> MPlayer-1.2.r38304.tar.xz/stream/librtsp/rtsp.c Changed

@@ -34,20 +34,20 @@
 #include <assert.h>
 #include "config.h"
 #include <string.h>
-#include <strings.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <time.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <inttypes.h>
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
 #else
+#include <sys/time.h>
 #include <sys/socket.h>
 #endif
+#include "libavutil/avstring.h"
 #include "mp_msg.h"
 #include "rtsp.h"
 #include "rtsp_session.h"
@@ -280,7 +280,7 @@
     if (!answer)
       return 0;
 
-    if (!strncasecmp(answer,"CSeq:",5)) {
+    if (!av_strncasecmp(answer,"CSeq:",5)) {
       sscanf(answer,"%*s %u",&answer_seq);
       if (s->cseq != answer_seq) {
 #ifdef LOG
@@ -289,14 +289,14 @@
         s->cseq=answer_seq;
       }
     }
-    if (!strncasecmp(answer,"Server:",7)) {
+    if (!av_strncasecmp(answer,"Server:",7)) {
       char *buf = malloc(strlen(answer));
       sscanf(answer,"%*s %s",buf);
       free(s->server);
       s->server=strdup(buf);
       free(buf);
     }
-    if (!strncasecmp(answer,"Session:",8)) {
+    if (!av_strncasecmp(answer,"Session:",8)) {
       char *buf = calloc(1, strlen(answer));
       sscanf(answer,"%*s %s",buf);
       if (s->session) {
@@ -484,7 +484,7 @@
         rest=rtsp_get(s);
         if (!rest)
           return -1;
-        if (!strncasecmp(rest,"CSeq:",5))
+        if (!av_strncasecmp(rest,"CSeq:",5))
           sscanf(rest,"%*s %u",&seq);
       } while (strlen(rest)!=0);
       free(rest);
@@ -594,7 +594,7 @@
   answer=s->answers;
 
   while (*answer) {
-    if (!strncasecmp(*answer,tag,strlen(tag))) {
+    if (!av_strncasecmp(*answer,tag,strlen(tag))) {
       ptr=strchr(*answer,':');
       if (!ptr) return NULL;
       ptr++;

MPlayer-1.2.r38170.tar.xz/stream/network.c -> MPlayer-1.2.r38304.tar.xz/stream/network.c Changed

@@ -23,13 +23,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
 
 #include "config.h"
 
+#include "libavutil/avstring.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 
@@ -140,12 +140,12 @@
 	URL_t *url_out = NULL;
 	if( url==NULL ) return NULL;
 	url_out = url_new( url->url );
-	if( !strcasecmp(url->protocol, "http_proxy") ) {
+	if( !av_strcasecmp(url->protocol, "http_proxy") ) {
 		mp_msg(MSGT_NETWORK,MSGL_V,"Using HTTP proxy: http://%s:%d\n", url->hostname, url->port );
 		return url_out;
 	}
 	// Check if the http_proxy environment variable is set.
-	if( !strcasecmp(url->protocol, "http") ) {
+	if( !av_strcasecmp(url->protocol, "http") ) {
 		char *proxy;
 		proxy = getenv("http_proxy");
 		if( proxy!=NULL ) {
@@ -210,7 +210,7 @@
 
 	http_hdr = http_new_header();
 
-	if( !strcasecmp(url->protocol, "http_proxy") ) {
+	if( !av_strcasecmp(url->protocol, "http_proxy") ) {
 		proxy = 1;
 		server_url = url_new( (url->file)+1 );
 		if (!server_url) {
@@ -250,7 +250,7 @@
 	    }
 	}
 
-	if( strcasecmp(url->protocol, "noicyx") )
+	if( av_strcasecmp(url->protocol, "noicyx") )
 	    http_set_field(http_hdr, "Icy-MetaData: 1");
 
 	if(pos>0) {

MPlayer-1.2.r38170.tar.xz/stream/network.h -> MPlayer-1.2.r38304.tar.xz/stream/network.h Changed

MPlayer-1.2.r38170.tar.xz/stream/pnm.c -> MPlayer-1.2.r38304.tar.xz/stream/pnm.c Changed

MPlayer-1.2.r38170.tar.xz/stream/stream.c -> MPlayer-1.2.r38304.tar.xz/stream/stream.c Changed

@@ -28,7 +28,6 @@
 #include <sys/wait.h>
 #endif
 #include <fcntl.h>
-#include <strings.h>
 #include <assert.h>
 
 #include "config.h"
@@ -37,6 +36,7 @@
 #include <winsock2.h>
 #endif
 
+#include "libavutil/avstring.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "osdep/shmem.h"
@@ -181,7 +181,7 @@
     }
   }
   s = new_stream(-2,-2);
-  s->capture_file = NULL;
+  s->capture_stream = NULL;
   s->url=strdup(filename);
   s->flags |= mode;
   *ret = sinfo->open(s,mode,arg,file_format);
@@ -227,7 +227,7 @@
       int l = strlen(sinfo->protocols[j]);
       // l == 0 => Don't do protocol matching (ie network and filenames)
       if((l == 0 && !strstr(filename, "://")) ||
-         ((strncasecmp(sinfo->protocols[j],filename,l) == 0) &&
+         ((av_strncasecmp(sinfo->protocols[j],filename,l) == 0) &&
 		      (strncmp("://",filename+l,3) == 0))) {
 	int r;
 	char *redirected_url = NULL;
@@ -270,11 +270,11 @@
 
 void stream_capture_do(stream_t *s)
 {
-  if (fwrite(s->buffer, s->buf_len, 1, s->capture_file) < 1) {
+  if (stream_write_buffer(s->capture_stream, s->buffer, s->buf_len) != s->buf_len) {
     mp_msg(MSGT_GLOBAL, MSGL_ERR, MSGTR_StreamErrorWritingCapture,
            strerror(errno));
-    fclose(s->capture_file);
-    s->capture_file = NULL;
+    free_stream(s->capture_stream);
+    s->capture_stream = NULL;
   }
 }
 
@@ -370,7 +370,7 @@
   // definitely not at EOF yet
   s->eof = 0;
 //  printf("[%d]",len);fflush(stdout);
-  if (s->capture_file)
+  if (s->capture_stream)
     stream_capture_do(s);
   return s->buf_len;
 }
@@ -540,14 +540,15 @@
   return s;
 }
 
-void free_stream(stream_t *s){
+int free_stream(stream_t *s){
+  int res = 0;
 //  printf("\n*** free_stream() called ***\n");
 #ifdef CONFIG_STREAM_CACHE
     cache_uninit(s);
 #endif
-  if (s->capture_file) {
-    fclose(s->capture_file);
-    s->capture_file = NULL;
+  if (s->capture_stream) {
+    res |= free_stream(s->capture_stream);
+    s->capture_stream = NULL;
   }
 
   if(s->close) s->close(s);
@@ -557,7 +558,7 @@
        network socket and file */
     if(s->url && strstr(s->url,"://"))
       closesocket(s->fd);
-    else close(s->fd);
+    else res |= close(s->fd);
   }
 #if HAVE_WINSOCK2_H
   mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n");
@@ -568,6 +569,7 @@
   //free(s->priv);
   free(s->url);
   free(s);
+  return res;
 }
 
 stream_t* new_ds_stream(demux_stream_t *ds) {

MPlayer-1.2.r38170.tar.xz/stream/stream.h -> MPlayer-1.2.r38304.tar.xz/stream/stream.h Changed

@@ -63,6 +63,7 @@
 /// streams that use the new api should check the mode at open
 #define STREAM_READ  0
 #define STREAM_WRITE 1
+#define STREAM_APPEND 2
 /// Seek flags, if not mannualy set and s->seek isn't NULL
 /// MP_STREAM_SEEK is automaticly set
 #define MP_STREAM_SEEK_BW  2
@@ -178,7 +179,7 @@
   streaming_ctrl_t *streaming_ctrl;
 #endif
   unsigned char buffer[STREAM_BUFFER_SIZE>STREAM_MAX_SECTOR_SIZE?STREAM_BUFFER_SIZE:STREAM_MAX_SECTOR_SIZE];
-  FILE *capture_file;
+  struct stream *capture_stream;
 } stream_t;
 
 #ifdef CONFIG_NETWORKING
@@ -361,7 +362,7 @@
 void stream_reset(stream_t *s);
 int stream_control(stream_t *s, int cmd, void *arg);
 stream_t* new_stream(int fd,int type);
-void free_stream(stream_t *s);
+int free_stream(stream_t *s);
 stream_t* new_memory_stream(unsigned char* data,int len);
 stream_t* open_stream(const char* filename,char** options,int* file_format);
 stream_t* open_stream_full(const char* filename,int mode, char** options, int* file_format);
@@ -392,6 +393,7 @@
 extern const m_option_t dvbin_opts_conf[];
 
 extern char *rtsp_destination;
+extern char *lavfstreamopts;
 
 typedef struct {
  int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm

MPlayer-1.2.r38170.tar.xz/stream/stream_bd.c -> MPlayer-1.2.r38304.tar.xz/stream/stream_bd.c Changed

@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <limits.h>
 #include <ctype.h>
-#include <strings.h>
 
 #include "libavutil/common.h"
 #include "libavutil/aes.h"
@@ -148,7 +147,6 @@
 static int find_vuk(struct bd_priv *bd, const uint8_t discid[20])
 {
     char line[1024];
-    char filename[PATH_MAX];
     const char *home;
     int vukfound = 0;
     stream_t *file;
@@ -157,8 +155,9 @@
 
     // look up discid in KEYDB.cfg to get VUK
     home = getenv("HOME");
-    snprintf(filename, sizeof(filename), "%s/.cache/aacs/vuk/%s", home, idstr);
+    char *filename = av_asprintf("%s/.cache/aacs/vuk/%s", home, idstr);
     file = open_stream(filename, NULL, NULL);
+    av_freep(&filename);
     if (file) {
         vukfound = 1;
         memset(line, 0, sizeof(line));
@@ -171,17 +170,20 @@
         if (vukfound)
             return 1;
     }
-    snprintf(filename, sizeof(filename), "%s/.config/aacs/KEYDB.cfg", home);
+    filename = av_asprintf("%s/.config/aacs/KEYDB.cfg", home);
     file = open_stream(filename, NULL, NULL);
     if (!file) {
-        snprintf(filename, sizeof(filename), "%s/.dvdcss/KEYDB.cfg", home);
+        av_freep(&filename);
+        filename = av_asprintf("%s/.dvdcss/KEYDB.cfg", home);
         file = open_stream(filename, NULL, NULL);
     }
     if (!file) {
         mp_msg(MSGT_OPEN,MSGL_ERR,
                "Cannot open VUK database file %s\n", filename);
+        av_freep(&filename);
         return 0;
     }
+    av_freep(&filename);
     while (stream_read_line(file, line, sizeof(line), 0)) {
         char *vst;
 
@@ -195,7 +197,7 @@
         // or         I | I-Key
         // can be followed by ; and comment
 
-        if (strncasecmp(line, idstr, 40))
+        if (av_strncasecmp(line, idstr, 40))
             continue;
         mp_msg(MSGT_OPEN, MSGL_V, "KeyDB found Entry for DiscID:\n%s\n", line);
 
@@ -225,23 +227,25 @@
     struct AVAES *a;
     struct AVSHA *asha;
     stream_t *file;
-    char filename[PATH_MAX];
     uint8_t discid[20];
     char idstr[ID_STR_LEN];
 
-    snprintf(filename, sizeof(filename), BD_UKF_PATH, bd->device);
+    char *filename = av_asprintf(BD_UKF_PATH, bd->device);
     file = open_stream(filename, NULL, NULL);
     if (!file) {
         mp_msg(MSGT_OPEN, MSGL_ERR,
                "Cannot open file %s to get UK and DiscID\n", filename);
+        av_freep(&filename);
         return 0;
     }
     file_size = file->end_pos;
     if (file_size <= 0 || file_size > 10 * 1024* 1024) {
         mp_msg(MSGT_OPEN, MSGL_ERR, "File %s too large\n", filename);
+        av_freep(&filename);
         free_stream(file);
         return 0;
     }
+    av_freep(&filename);
     buf = av_malloc(file_size);
     stream_read(file, buf, file_size);
     free_stream(file);
@@ -433,15 +437,16 @@
 {
     int i;
     int langmap_offset, index_offset, end_offset;
-    char filename[PATH_MAX];
     stream_t *file;
 
-    snprintf(filename, sizeof(filename), BD_CLIPINF_PATH, bd->device, bd->title);
+    char *filename = av_asprintf(BD_CLIPINF_PATH, bd->device, bd->title);
     file = open_stream(filename, NULL, NULL);
     if (!file) {
         mp_msg(MSGT_OPEN, MSGL_ERR, "Cannot open clipinf %s\n", filename);
+        av_freep(&filename);
         return;
     }
+    av_freep(&filename);
     if (stream_read_qword(file) != AV_RB64("HDMV0200")) {
         mp_msg(MSGT_OPEN, MSGL_ERR, "Unknown clipinf format\n");
         return;
@@ -491,7 +496,7 @@
 
 static int bd_stream_open(stream_t *s, int mode, void* opts, int* file_format)
 {
-    char filename[PATH_MAX];
+    char *filename;
 
     struct stream_priv_s* p = opts;
     struct bd_priv *bd = calloc(1, sizeof(*bd));
@@ -528,9 +533,10 @@
     // set up AES key from uk
     av_aes_init(bd->aeseed, bd->uks.keys[0].u8, 128, 0);
 
-    snprintf(filename, sizeof(filename), BD_M2TS_PATH, bd->device, bd->title);
+    filename = av_asprintf(BD_M2TS_PATH, bd->device, bd->title);
     mp_msg(MSGT_OPEN, MSGL_STATUS, "Opening %s\n", filename);
     bd->title_file = open_stream(filename, NULL, NULL);
+    av_freep(&filename);
     if (!bd->title_file)
         return STREAM_ERROR;
     s->end_pos = bd->title_file->end_pos;

MPlayer-1.2.r38170.tar.xz/stream/stream_cddb.c -> MPlayer-1.2.r38304.tar.xz/stream/stream_cddb.c Changed

MPlayer-1.2.r38170.tar.xz/stream/stream_dvb.c -> MPlayer-1.2.r38304.tar.xz/stream/stream_dvb.c Changed

MPlayer-1.2.r38170.tar.xz/stream/stream_dvd.c -> MPlayer-1.2.r38304.tar.xz/stream/stream_dvd.c Changed

MPlayer-1.2.r38170.tar.xz/stream/stream_ffmpeg.c -> MPlayer-1.2.r38304.tar.xz/stream/stream_ffmpeg.c Changed

@@ -27,6 +27,8 @@
 #include "av_helpers.h"
 #include "libmpdemux/demuxer.h"
 
+char *lavfstreamopts;
+
 static int fill_buffer(stream_t *s, char *buffer, int max_len)
 {
     int r = avio_read(s->priv, buffer, max_len);
@@ -90,6 +92,7 @@
 {
     int flags = 0;
     const char *filename;
+    AVDictionary *avopts = NULL;
     AVIOContext *ctx = NULL;
     int res = STREAM_ERROR;
     int64_t size;
@@ -125,9 +128,23 @@
     dummy = !strncmp(filename, "rtsp:", 5) || !strncmp(filename, "dummy:", 6);
     mp_msg(MSGT_OPEN, MSGL_V, "[ffmpeg] Opening %s\n", filename);
 
-    if (!dummy && avio_open(&ctx, filename, flags) < 0)
+    if (lavfstreamopts && av_dict_parse_string(&avopts, lavfstreamopts, "=", ",", 0) < 0) {
+        mp_msg(MSGT_HEADER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", lavfstreamopts);
+        goto out;
+    }
+
+    if (!dummy && avio_open2(&ctx, filename, flags, NULL, &avopts) < 0)
         goto out;
 
+    if (!dummy && av_dict_count(avopts)) {
+        AVDictionaryEntry *e = NULL;
+        while ((e = av_dict_get(avopts, "", e, AV_DICT_IGNORE_SUFFIX))) {
+            mp_msg(MSGT_HEADER,MSGL_ERR,"Unknown option %s\n", e->key);
+        }
+        goto out;
+    }
+    av_dict_free(&avopts);
+
     stream->priv = ctx;
     size = dummy ? 0 : avio_size(ctx);
     if (size >= 0)

MPlayer-1.2.r38170.tar.xz/stream/stream_file.c -> MPlayer-1.2.r38304.tar.xz/stream/stream_file.c Changed

MPlayer-1.2.r38170.tar.xz/stream/stream_netstream.h -> MPlayer-1.2.r38304.tar.xz/stream/stream_netstream.h Changed

MPlayer-1.2.r38170.tar.xz/stream/stream_pvr.c -> MPlayer-1.2.r38304.tar.xz/stream/stream_pvr.c Changed

@@ -28,9 +28,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <strings.h>
 #include <ctype.h>
-#include <sys/time.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
@@ -301,7 +299,7 @@
   /* select channel */
   for (i = 0; i < pvr->stationlist.used; i++)
   {
-    if (channel && !strcasecmp (pvr->stationlist.list[i].name, channel))
+    if (channel && !av_strcasecmp (pvr->stationlist.list[i].name, channel))
       break; /* found existing channel entry */
 
     if (freq > 0 && pvr->stationlist.list[i].freq == freq)
@@ -416,7 +414,7 @@
     /* select channel list */
     for (i = 0; chanlists[i].name != NULL; i++)
     {
-      if (!strcasecmp (chanlists[i].name, stream_tv_defaults.chanlist))
+      if (!av_strcasecmp (chanlists[i].name, stream_tv_defaults.chanlist))
       {
         chantab = i;
         break;
@@ -682,7 +680,7 @@
     /* select by channel */
     for (i = 0; i < pvr->stationlist.used ; i++)
     {
-      if (!strcasecmp (pvr->stationlist.list[i].name, channel))
+      if (!av_strcasecmp (pvr->stationlist.list[i].name, channel))
       {
         if (!pvr->stationlist.list[i].enabled)
         {

MPlayer-1.2.r38170.tar.xz/stream/tcp.c -> MPlayer-1.2.r38304.tar.xz/stream/tcp.c Changed

MPlayer-1.2.r38170.tar.xz/stream/tv.c -> MPlayer-1.2.r38304.tar.xz/stream/tv.c Changed

@@ -29,9 +29,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <strings.h>
 #include <ctype.h>
-#include <sys/time.h>
 
 #include "config.h"
 
@@ -280,19 +278,19 @@
         return 0;
     }
 
-    if (!strcasecmp(norm, "pal"))
+    if (!av_strcasecmp(norm, "pal"))
         return TV_NORM_PAL;
-    else if (!strcasecmp(norm, "ntsc"))
+    else if (!av_strcasecmp(norm, "ntsc"))
         return TV_NORM_NTSC;
-    else if (!strcasecmp(norm, "secam"))
+    else if (!av_strcasecmp(norm, "secam"))
         return TV_NORM_SECAM;
-    else if (!strcasecmp(norm, "palnc"))
+    else if (!av_strcasecmp(norm, "palnc"))
         return TV_NORM_PALNC;
-    else if (!strcasecmp(norm, "palm"))
+    else if (!av_strcasecmp(norm, "palm"))
         return TV_NORM_PALM;
-    else if (!strcasecmp(norm, "paln"))
+    else if (!av_strcasecmp(norm, "paln"))
         return TV_NORM_PALN;
-    else if (!strcasecmp(norm, "ntscjp"))
+    else if (!av_strcasecmp(norm, "ntscjp"))
         return TV_NORM_NTSCJP;
     else {
         mp_msg(MSGT_TV, MSGL_WARN, MSGTR_TV_BogusNormParameter, norm, "PAL");
@@ -337,7 +335,7 @@
             tv_channel_current->freq = 0;
             for (i = 0; i < chanlists[tvh->chanlist].count; i++) {
                 cl = tvh->chanlist_s[i];
-                if (!strcasecmp(cl.name, tv_channel_current->number)) {
+                if (!av_strcasecmp(cl.name, tv_channel_current->number)) {
                     tv_channel_current->freq=cl.freq;
                     break;
                 }
@@ -544,7 +542,7 @@
     /* select channel list */
     for (i = 0; chanlists[i].name != NULL; i++)
     {
-	if (!strcasecmp(chanlists[i].name, tvh->tv_param->chanlist))
+	if (!av_strcasecmp(chanlists[i].name, tvh->tv_param->chanlist))
 	{
 	    tvh->chanlist = i;
 	    tvh->chanlist_s = chanlists[i].list;
@@ -629,7 +627,7 @@
 	    cl = tvh->chanlist_s[i];
 		    //  printf("count%d: name: %s, freq: %d\n",
 		    //	i, cl.name, cl.freq);
-	    if (!strcasecmp(cl.name, tvh->tv_param->channel))
+	    if (!av_strcasecmp(cl.name, tvh->tv_param->channel))
 	    {
 			strcpy(tv_channel_last_real, cl.name);
 		tvh->channel = i;
@@ -1058,7 +1056,7 @@
 	    cl = tvh->chanlist_s[i];
 //	    printf("count%d: name: %s, freq: %d\n",
 //		i, cl.name, cl.freq);
-	    if (!strcasecmp(cl.name, channel))
+	    if (!av_strcasecmp(cl.name, channel))
 	    {
 		tvh->channel = i;
 		mp_msg(MSGT_TV, MSGL_INFO, MSGTR_TV_SelectedChannel2,
@@ -1104,7 +1102,7 @@
 		for (i = 0; i < chanlists[tvh->chanlist].count; i++)
 		{
 		    cl = tvh->chanlist_s[i];
-		    if (!strcasecmp(cl.name, tv_channel_last_real))
+		    if (!av_strcasecmp(cl.name, tv_channel_last_real))
 		    {
 			strcpy(tv_channel_last_real, tvh->chanlist_s[tvh->channel].name);
 			tvh->channel = i;

MPlayer-1.2.r38170.tar.xz/stream/tvi_dshow.c -> MPlayer-1.2.r38304.tar.xz/stream/tvi_dshow.c Changed

@@ -75,8 +75,8 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <strings.h>
 
+#include "libavutil/avstring.h"
 #include "libmpcodecs/img_format.h"
 #include "libmpcodecs/dec_teletext.h"
 #include "libaf/af_format.h"
@@ -86,6 +86,7 @@
 
 #include "tv.h"
 #include "mp_msg.h"
+#include "mppacked.h"
 #include "frequencies.h"
 
 
@@ -221,12 +222,14 @@
  \note
  structure have to be 2-byte aligned and have 10-byte length!!
 */
-typedef struct __attribute__((__packed__)) {
+MP_PACKED(
+typedef struct, {
     WORD CountryCode;		///< Country code
     WORD CableFreqTable;	///< index of resource with frequencies for cable channels
     WORD BroadcastFreqTable;	///< index of resource with frequencies for broadcast channels
     DWORD VideoStandard;	///< used video standard
 } TRCCountryList;
+)
 /**
     information about image formats
 */
@@ -3463,7 +3466,7 @@
 	    if (!priv->pTVTuner)
 		return TVI_CONTROL_FALSE;
 	    for (i = 0; i < tv_available_norms_count; i++) {
-		if (!strcasecmp
+		if (!av_strcasecmp
 		    (tv_norms[tv_available_norms[i]].name, (char *) arg)) {
 		    *(int *) arg = i + 1;
 		    return TVI_CONTROL_TRUE;

MPlayer-1.2.r38170.tar.xz/stream/tvi_v4l.c -> MPlayer-1.2.r38304.tar.xz/stream/tvi_v4l.c Changed

@@ -48,12 +48,12 @@
 #include <sys/mman.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <pthread.h>
 #ifdef HAVE_SYS_SYSINFO_H
 #include <sys/sysinfo.h>
 #endif
 
+#include "libavutil/avstring.h"
 #include "mp_msg.h"
 #include "libaf/af_format.h"
 #include "libmpcodecs/img_format.h"
@@ -541,11 +541,11 @@
                bparm.HorDcm, bparm.VerDcm, bparm.TmpDcm);
 
         bparm.input = priv->tv_param->input; /* tv */
-        if (!strcasecmp(priv->tv_param->norm, "pal"))
+        if (!av_strcasecmp(priv->tv_param->norm, "pal"))
             bparm.norm =  0; /* PAL */
-        else if (!strcasecmp(priv->tv_param->norm, "ntsc"))
+        else if (!av_strcasecmp(priv->tv_param->norm, "ntsc"))
             bparm.norm =  1; /* NTSC */
-        else if (!strcasecmp(priv->tv_param->norm, "secam"))
+        else if (!av_strcasecmp(priv->tv_param->norm, "secam"))
             bparm.norm =  2; /* SECAM */
         bparm.quality = priv->tv_param->quality;
         bparm.decimation = priv->tv_param->decimation;

MPlayer-1.2.r38170.tar.xz/stream/tvi_v4l2.c -> MPlayer-1.2.r38304.tar.xz/stream/tvi_v4l2.c Changed

MPlayer-1.2.r38170.tar.xz/stream/udp.c -> MPlayer-1.2.r38304.tar.xz/stream/udp.c Changed

MPlayer-1.2.r38170.tar.xz/stream/url.c -> MPlayer-1.2.r38304.tar.xz/stream/url.c Changed

MPlayer-1.2.r38170.tar.xz/sub/font_load.c -> MPlayer-1.2.r38304.tar.xz/sub/font_load.c Changed

MPlayer-1.2.r38170.tar.xz/sub/font_load_ft.c -> MPlayer-1.2.r38304.tar.xz/sub/font_load_ft.c Changed

@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <strings.h>
 
 #ifdef CONFIG_ICONV
 #include <iconv.h>
@@ -44,6 +43,7 @@
 #endif
 
 #include "libavutil/common.h"
+#include "libavutil/avstring.h"
 #include "mpbswap.h"
 #include "font_load.h"
 #include "mp_msg.h"
@@ -107,7 +107,7 @@
 #define f1616ToInt(x)		(((x)+0x8000)>>16)	// 16.16
 #define floatTof266(x)		((int)((x)*(1<<6)+0.5))
 
-#define ALIGN(x)                (((x)+7)&~7)    // 8 byte align
+#define ALIGN(x)                (((x)+15)&~15)    // 16 byte align
 
 #define WARNING(msg, args...)      mp_msg(MSGT_OSD, MSGL_WARN, msg "\n", ## args)
 
@@ -986,7 +986,7 @@
     if (subtitle_font_ppem > 128) subtitle_font_ppem = 128;
     if (osd_font_ppem > 128) osd_font_ppem = 128;
 
-    unicode = !subtitle_font_encoding || strcasecmp(subtitle_font_encoding, "unicode") == 0;
+    unicode = !subtitle_font_encoding || av_strcasecmp(subtitle_font_encoding, "unicode") == 0;
 
     desc = init_font_desc();
     if(!desc) goto err_out;

MPlayer-1.2.r38170.tar.xz/sub/osd.c -> MPlayer-1.2.r38304.tar.xz/sub/osd.c Changed

@@ -28,18 +28,14 @@
 #include "mp_msg.h"
 #include <inttypes.h>
 #include <stdlib.h>
+#include "mpmem.h"
 #include "libmpcodecs/img_format.h"
 #include "cpudetect.h"
 
-#if !HAVE_EMMINTRIN_H
-#undef HAVE_SSE2
-#define HAVE_SSE2 0
-#endif
-
 #if ARCH_X86 && (!HAVE_SSE2 || CONFIG_RUNTIME_CPUDETECT)
-static const uint64_t bFF __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
-static const unsigned long long mask24lh  __attribute__((aligned(8))) = 0xFFFF000000000000ULL;
-static const unsigned long long mask24hl  __attribute__((aligned(8))) = 0x0000FFFFFFFFFFFFULL;
+DECLARE_ALIGNED(8, static const uint64_t, bFF) = 0xFFFFFFFFFFFFFFFFULL;
+DECLARE_ALIGNED(8, static const unsigned long long, mask24lh) = 0xFFFF000000000000ULL;
+DECLARE_ALIGNED(8, static const unsigned long long, mask24hl) = 0x0000FFFFFFFFFFFFULL;
 #endif
 
 //Note: we have C, X86-nommx, MMX, MMX2, 3DNOW version therse no 3DNOW+MMX2 one
@@ -62,10 +58,12 @@
 #define COMPILE_3DNOW
 #endif
 
-#if HAVE_SSE2 || CONFIG_RUNTIME_CPUDETECT
+#if HAVE_EMMINTRIN_H && (HAVE_SSE2 || CONFIG_RUNTIME_CPUDETECT)
+// crashes on win32 due to alignment issues of unclear cause
+#if !defined(_WIN32) || !ARCH_X86_32
 #define COMPILE_SSE2
 #endif
-
+#endif
 #endif /* ARCH_X86 */
 
 #undef HAVE_MMX
@@ -175,9 +173,12 @@
 #if CONFIG_RUNTIME_CPUDETECT
 #if ARCH_X86
 	// ordered by speed / fastest first
-	if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2)
+#ifdef COMPILE_SSE2
+	if(gCpuCaps.hasSSE2)
 		vo_draw_alpha_yv12_SSE2(w, h, src, srca, srcstride, dstbase, dststride);
-	else if(gCpuCaps.hasMMX2)
+	else
+#endif
+	if(gCpuCaps.hasMMX2)
 		vo_draw_alpha_yv12_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
 	else if(gCpuCaps.has3DNow)
 		vo_draw_alpha_yv12_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
@@ -209,9 +210,12 @@
 #if CONFIG_RUNTIME_CPUDETECT
 #if ARCH_X86
 	// ordered by speed / fastest first
-	if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2)
+#ifdef COMPILE_SSE2
+	if(gCpuCaps.hasSSE2)
 		vo_draw_alpha_yuy2_SSE2(w, h, src, srca, srcstride, dstbase, dststride);
-	else if(gCpuCaps.hasMMX2)
+	else
+#endif
+	if(gCpuCaps.hasMMX2)
 		vo_draw_alpha_yuy2_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
 	else if(gCpuCaps.has3DNow)
 		vo_draw_alpha_yuy2_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
@@ -243,9 +247,12 @@
 #if CONFIG_RUNTIME_CPUDETECT
 #if ARCH_X86
 	// ordered by speed / fastest first
-	if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2)
+#ifdef COMPILE_SSE2
+	if(gCpuCaps.hasSSE2)
 		vo_draw_alpha_uyvy_SSE2(w, h, src, srca, srcstride, dstbase, dststride);
-	else if(gCpuCaps.hasMMX2)
+	else
+#endif
+	if(gCpuCaps.hasMMX2)
 		vo_draw_alpha_uyvy_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
 	else if(gCpuCaps.has3DNow)
 		vo_draw_alpha_uyvy_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
@@ -277,9 +284,12 @@
 #if CONFIG_RUNTIME_CPUDETECT
 #if ARCH_X86
 	// ordered by speed / fastest first
-	if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2)
+#ifdef COMPILE_SSE2
+	if(gCpuCaps.hasSSE2)
 		vo_draw_alpha_rgb24_SSE2(w, h, src, srca, srcstride, dstbase, dststride);
-	else if(gCpuCaps.hasMMX2)
+	else
+#endif
+	if(gCpuCaps.hasMMX2)
 		vo_draw_alpha_rgb24_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
 	else if(gCpuCaps.has3DNow)
 		vo_draw_alpha_rgb24_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
@@ -311,9 +321,12 @@
 #if CONFIG_RUNTIME_CPUDETECT
 #if ARCH_X86
 	// ordered by speed / fastest first
-	if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2)
+#ifdef COMPILE_SSE2
+	if(gCpuCaps.hasSSE2)
 		vo_draw_alpha_rgb32_SSE2(w, h, src, srca, srcstride, dstbase, dststride);
-	else if(gCpuCaps.hasMMX2)
+	else
+#endif
+	if(gCpuCaps.hasMMX2)
 		vo_draw_alpha_rgb32_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
 	else if(gCpuCaps.has3DNow)
 		vo_draw_alpha_rgb32_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
@@ -361,10 +374,13 @@
 	{
 #if CONFIG_RUNTIME_CPUDETECT
 #if ARCH_X86
-		// ordered per speed fasterst first
-		if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2)
+		// ordered per speed fastest first
+#ifdef COMPILE_SSE2
+		if(gCpuCaps.hasSSE2)
 			mp_msg(MSGT_OSD,MSGL_INFO,"Using SSE2 Optimized OnScreenDisplay\n");
-		else if(gCpuCaps.hasMMX2)
+		else
+#endif
+		if(gCpuCaps.hasMMX2)
 			mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit MMX2) Optimized OnScreenDisplay\n");
 		else if(gCpuCaps.has3DNow)
 			mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit 3DNow) Optimized OnScreenDisplay\n");

MPlayer-1.2.r38170.tar.xz/sub/spudec.c -> MPlayer-1.2.r38304.tar.xz/sub/spudec.c Changed

@@ -28,6 +28,7 @@
  */
 
 #include "config.h"
+#include "libavutil/avstring.h"
 #include "mp_msg.h"
 
 #include <errno.h>
@@ -36,7 +37,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <strings.h>
 #include <math.h>
 #include "sub.h"
 #include "libvo/video_out.h"
@@ -354,7 +354,7 @@
 
 static void spudec_process_data(spudec_handle_t *this, packet_t *packet)
 {
-  unsigned int i, x, y;
+  unsigned int limit0, limit1, x, y;
   uint8_t *dst;
 
   if (!spudec_alloc_image(this, packet->stride, packet->height))
@@ -368,12 +368,17 @@
   memcpy(this->palette, packet->palette, sizeof(this->palette));
   memcpy(this->alpha,   packet->alpha,   sizeof(this->alpha));
 
-  i = packet->current_nibble[1];
+  limit0 = packet->current_nibble[1];
+  limit1 = 2*packet->control_start;
+  if (packet->current_nibble[0] > packet->current_nibble[1]) {
+    limit0 = limit1;
+    limit1 = packet->current_nibble[0];
+  }
   x = 0;
   y = 0;
   dst = this->pal_image;
-  while (packet->current_nibble[0] < i
-	 && packet->current_nibble[1] / 2 < packet->control_start
+  while (packet->current_nibble[0] < limit0
+	 && packet->current_nibble[1] < limit1
 	 && y < this->pal_height) {
     unsigned int len, color;
     unsigned int rle = 0;
@@ -1287,7 +1292,7 @@
         pal[i] = vobsub_palette_to_yuv(pal[i]);
       this->auto_palette = 0;
     }
-    if (!strncasecmp(ptr, "forced subs: on", 15))
+    if (!av_strncasecmp(ptr, "forced subs: on", 15))
       this->forced_subs_only = 1;
     if (!strncmp(ptr, "custom colors: ON, tridx: ", 26) &&
         sscanf(ptr + 26, "%x, colors: %x, %x, %x, %x",

MPlayer-1.2.r38170.tar.xz/sub/sub.c -> MPlayer-1.2.r38304.tar.xz/sub/sub.c Changed

MPlayer-1.2.r38170.tar.xz/sub/subassconvert.c -> MPlayer-1.2.r38304.tar.xz/sub/subassconvert.c Changed

MPlayer-1.2.r38170.tar.xz/sub/subreader.c -> MPlayer-1.2.r38304.tar.xz/sub/subreader.c Changed

@@ -24,11 +24,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <ctype.h>
 
+#ifndef _MSC_VER
 #include <sys/types.h>
 #include <dirent.h>
+#endif
 
 #include "ass_mp.h"
 #include "config.h"
@@ -111,7 +112,7 @@
 
     len=strlen(needle);
     while (*p != '\0') {
-	if (strncasecmp(p, needle, len) == 0) return (char*)p;
+	if (av_strncasecmp(p, needle, len) == 0) return (char*)p;
 	p++;
     }
 
@@ -179,13 +180,13 @@
 	    if (p - text >= LINE_LEN)
 	        sami_add_line(current, text, &p);
 	    if (*s == '\0') break;
-	    else if (!strncasecmp (s, "<br>", 4)) {
+	    else if (!av_strncasecmp (s, "<br>", 4)) {
                 sami_add_line(current, text, &p);
 		s += 4;
 	    }
 	    else if ((*s == '{') && !sub_no_text_pp) { state = 5; ++s; continue; }
 	    else if (*s == '<') { state = 4; }
-	    else if (!strncasecmp (s, "&nbsp;", 6)) { *p++ = ' '; s += 6; }
+	    else if (!av_strncasecmp (s, "&nbsp;", 6)) { *p++ = ' '; s += 6; }
 	    else if (*s == '\t') { *p++ = ' '; s++; }
 	    else if (*s == '\r' || *s == '\n') { s++; }
 	    else *p++ = *s++;
@@ -1180,7 +1181,7 @@
 		{*uses_time=1;return SUB_VPLAYER;}
 	if (sscanf (line, "%d:%d:%d ",     &i, &i, &i )==3)
 		{*uses_time=1;return SUB_VPLAYER;}
-	if (!strncasecmp(line, "<window", 7))
+	if (!av_strncasecmp(line, "<window", 7))
 		{*uses_time=1;return SUB_RT;}
 	if (!memcmp(line, "Dialogue: Marked", 16))
 		{*uses_time=1; return SUB_SSA;}
@@ -1441,7 +1442,7 @@
     mp_msg(MSGT_SUBREADER, MSGL_V, "\n");
 
     for (i = 0; i < langcnt; i++) {
-	if (strcasecmp(languages[i], preferred_language) != 0) continue;
+	if (av_strcasecmp(languages[i], preferred_language) != 0) continue;
 	analyser = enca_analyser_alloc(languages[i]);
 	encoding = enca_analyse_const(analyser, buffer, buflen);
 	enca_analyser_free(analyser);
@@ -1535,7 +1536,7 @@
 	    if ((l=strlen(filename))>4){
 		    static const char exts[][8] = {".utf", ".utf8", ".utf-8" };
 		    for (k=3;--k>=0;)
-			if (l >= strlen(exts[k]) && !strcasecmp(filename+(l - strlen(exts[k])), exts[k])){
+			if (l >= strlen(exts[k]) && !av_strcasecmp(filename+(l - strlen(exts[k])), exts[k])){
 			    sub_utf8 = 1;
 			    break;
 			}
@@ -1976,6 +1977,9 @@
 static void append_dir_subtitles(struct sub_list *slist, const char *path,
                                  const char *fname, int limit_fuzziness)
 {
+#ifdef _MSC_VER
+    return;
+#else
     char *f_fname, *f_fname_noext, *f_fname_trim, *tmp, *tmp_sub_id;
     char *tmp_fname_noext, *tmp_fname_trim, *tmp_fname_ext, *tmpresult;
 
@@ -2024,7 +2028,7 @@
 
             // If it's a .sub, check if there is a .idx with the same name. If
             // there is one, it's certainly a vobsub so we skip it.
-            if (strcasecmp(tmp_fname_ext, "sub") == 0) {
+            if (av_strcasecmp(tmp_fname_ext, "sub") == 0) {
                 char *idx, *idxname = strdup(de->d_name);
 
                 strcpy(idxname + strlen(de->d_name) - sizeof("idx") + 1, "idx");
@@ -2042,14 +2046,14 @@
             found = 0;
 #ifdef CONFIG_ICONV
 #ifdef CONFIG_ENCA
-            for (i = ((sub_cp && strncasecmp(sub_cp, "enca", 4) != 0) ? 3 : 0); sub_exts[i]; i++) {
+            for (i = ((sub_cp && av_strncasecmp(sub_cp, "enca", 4) != 0) ? 3 : 0); sub_exts[i]; i++) {
 #else
             for (i = (sub_cp ? 3 : 0); sub_exts[i]; i++) {
 #endif
 #else
             for (i = 0; sub_exts[i]; i++) {
 #endif
-                if (strcasecmp(sub_exts[i], tmp_fname_ext) == 0) {
+                if (av_strcasecmp(sub_exts[i], tmp_fname_ext) == 0) {
                     found = 1;
                     break;
                 }
@@ -2130,6 +2134,7 @@
     free(tmp_fname_ext);
 
     free(tmpresult);
+#endif
 }
 
 /**

MPlayer-1.2.r38170.tar.xz/sub/vobsub.c -> MPlayer-1.2.r38304.tar.xz/sub/vobsub.c Changed

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
@@ -41,6 +40,7 @@
 #include "path.h"
 #include "unrar_exec.h"
 #include "libavutil/common.h"
+#include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "osdep/osdep.h"
 
@@ -116,7 +116,7 @@
                     int demanded_ext_len = strlen (demanded_ext);
                     for (i = 0, lp = list; i < num_files; i++, lp = lp->next) {
                         name_len = strlen (lp->item.Name);
-                        if (name_len >= demanded_ext_len && !strcasecmp (lp->item.Name + name_len - demanded_ext_len, demanded_ext)) {
+                        if (name_len >= demanded_ext_len && !av_strcasecmp (lp->item.Name + name_len - demanded_ext_len, demanded_ext)) {
                             rc = unrar_exec_get(&stream->data, &stream->size,
                                                 lp->item.Name, rar_filename);
                             if (rc)

MPlayer-1.2.r38170.tar.xz/subopt-helper.c -> MPlayer-1.2.r38304.tar.xz/subopt-helper.c Changed

MPlayer-1.2.r38170.tar.xz/udp_sync.c -> MPlayer-1.2.r38304.tar.xz/udp_sync.c Changed

MPlayer-1.2.r38170.tar.xz/version.sh -> MPlayer-1.2.r38304.tar.xz/version.sh Changed

Changes of Revision 109