[arch-commits] Commit in mplayer/repos (22 files)

Evangelos Foutras foutrelis at nymeria.archlinux.org
Tue May 14 19:48:58 EDT 2013


    Date: Wednesday, May 15, 2013 @ 01:48:58
  Author: foutrelis
Revision: 185552

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  mplayer/repos/extra-i686/PKGBUILD
    (from rev 185551, mplayer/trunk/PKGBUILD)
  mplayer/repos/extra-i686/cdio-includes.patch
    (from rev 185551, mplayer/trunk/cdio-includes.patch)
  mplayer/repos/extra-i686/mplayer.desktop
    (from rev 185551, mplayer/trunk/mplayer.desktop)
  mplayer/repos/extra-i686/mplayer.install
    (from rev 185551, mplayer/trunk/mplayer.install)
  mplayer/repos/extra-i686/mplayer.png
    (from rev 185551, mplayer/trunk/mplayer.png)
  mplayer/repos/extra-i686/subreader-fix-srt-parsing.patch
    (from rev 185551, mplayer/trunk/subreader-fix-srt-parsing.patch)
  mplayer/repos/extra-x86_64/PKGBUILD
    (from rev 185551, mplayer/trunk/PKGBUILD)
  mplayer/repos/extra-x86_64/cdio-includes.patch
    (from rev 185551, mplayer/trunk/cdio-includes.patch)
  mplayer/repos/extra-x86_64/mplayer.desktop
    (from rev 185551, mplayer/trunk/mplayer.desktop)
  mplayer/repos/extra-x86_64/mplayer.install
    (from rev 185551, mplayer/trunk/mplayer.install)
  mplayer/repos/extra-x86_64/mplayer.png
    (from rev 185551, mplayer/trunk/mplayer.png)
  mplayer/repos/extra-x86_64/subreader-fix-srt-parsing.patch
    (from rev 185551, mplayer/trunk/subreader-fix-srt-parsing.patch)
Deleted:
  mplayer/repos/extra-i686/PKGBUILD
  mplayer/repos/extra-i686/cdio-includes.patch
  mplayer/repos/extra-i686/mplayer.desktop
  mplayer/repos/extra-i686/mplayer.install
  mplayer/repos/extra-i686/mplayer.png
  mplayer/repos/extra-x86_64/PKGBUILD
  mplayer/repos/extra-x86_64/cdio-includes.patch
  mplayer/repos/extra-x86_64/mplayer.desktop
  mplayer/repos/extra-x86_64/mplayer.install
  mplayer/repos/extra-x86_64/mplayer.png

----------------------------------------------+
 /PKGBUILD                                    |  170 +++++++++++++++++++++++++
 /cdio-includes.patch                         |   86 ++++++++++++
 /mplayer.desktop                             |   42 ++++++
 /mplayer.install                             |   22 +++
 extra-i686/PKGBUILD                          |   76 -----------
 extra-i686/cdio-includes.patch               |   43 ------
 extra-i686/mplayer.desktop                   |   21 ---
 extra-i686/mplayer.install                   |   11 -
 extra-i686/subreader-fix-srt-parsing.patch   |   60 ++++++++
 extra-x86_64/PKGBUILD                        |   76 -----------
 extra-x86_64/cdio-includes.patch             |   43 ------
 extra-x86_64/mplayer.desktop                 |   21 ---
 extra-x86_64/mplayer.install                 |   11 -
 extra-x86_64/subreader-fix-srt-parsing.patch |   60 ++++++++
 14 files changed, 440 insertions(+), 302 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-05-14 23:48:31 UTC (rev 185551)
+++ extra-i686/PKGBUILD	2013-05-14 23:48:58 UTC (rev 185552)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgbase=mplayer
-pkgname=('mplayer' 'mencoder')
-pkgver=35920
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
-'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
-license=('GPL')
-url="http://www.mplayerhq.hu/"
-options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/packages/$pkgbase/$pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch)
-md5sums=('5f96e829d711e7d1ea65e324710dca50'
-         'c0d6ef795cf6de48e3b87ff7c23f0319'
-         '7b5be7191aafbea64218dc4916343bbc')
-
-build() {
-    cd "$srcdir/$pkgbase"
-    patch -Np0 -i ../cdio-includes.patch
-
-    ./configure --prefix=/usr \
-        --enable-runtime-cpudetection \
-        --disable-gui \
-        --disable-arts \
-        --disable-liblzo \
-        --disable-speex \
-        --disable-openal \
-        --disable-libdv \
-        --disable-musepack \
-        --disable-esd \
-        --disable-mga \
-        --disable-ass-internal \
-        --disable-cdparanoia \
-        --enable-xvmc \
-        --enable-radio \
-        --enable-radio-capture \
-        --language=all \
-        --confdir=/etc/mplayer 
-    [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
-
-    make
-}
-
-package_mplayer() {
-    pkgdesc="A movie player for linux"
-    install=mplayer.install
-    backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
-    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-    'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia')
-
-    cd "$srcdir/$pkgbase"
-
-    make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
-    install -dm755 "$pkgdir/usr/share/mplayer/"
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
-    rm -rf "$pkgdir/usr/share/mplayer/font"
-    #desktop file  FS#14770
-    install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
-    install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
-}
-
-package_mencoder() {
-    pkgdesc="Free command line video decoding, encoding and filtering tool"
-    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis')
-
-    cd "$srcdir/$pkgbase"
-    make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
-    find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
-}

Copied: mplayer/repos/extra-i686/PKGBUILD (from rev 185551, mplayer/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-05-14 23:48:58 UTC (rev 185552)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgbase=mplayer
+pkgname=('mplayer' 'mencoder')
+pkgver=35920
+pkgrel=3
+arch=('i686' 'x86_64')
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
+'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
+license=('GPL')
+url="http://www.mplayerhq.hu/"
+options=(!buildflags !emptydirs)
+source=(ftp://ftp.archlinux.org/other/packages/$pkgbase/$pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch subreader-fix-srt-parsing.patch)
+md5sums=('5f96e829d711e7d1ea65e324710dca50'
+         'c0d6ef795cf6de48e3b87ff7c23f0319'
+         '7b5be7191aafbea64218dc4916343bbc'
+         '7cb6019018a95dcc3d1231e1aaa8bbdb')
+
+prepare() {
+    cd "$srcdir/$pkgbase"
+
+    patch -Np0 -i ../cdio-includes.patch
+
+    # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139
+    patch -Np1 -i ../subreader-fix-srt-parsing.patch
+}
+
+build() {
+    cd "$srcdir/$pkgbase"
+
+    ./configure --prefix=/usr \
+        --enable-runtime-cpudetection \
+        --disable-gui \
+        --disable-arts \
+        --disable-liblzo \
+        --disable-speex \
+        --disable-openal \
+        --disable-libdv \
+        --disable-musepack \
+        --disable-esd \
+        --disable-mga \
+        --disable-ass-internal \
+        --disable-cdparanoia \
+        --enable-xvmc \
+        --enable-radio \
+        --enable-radio-capture \
+        --language=all \
+        --confdir=/etc/mplayer 
+    [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+
+    make
+}
+
+package_mplayer() {
+    pkgdesc="A movie player for linux"
+    install=mplayer.install
+    backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
+    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+    'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia')
+
+    cd "$srcdir/$pkgbase"
+
+    make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
+    install -dm755 "$pkgdir/usr/share/mplayer/"
+    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
+    rm -rf "$pkgdir/usr/share/mplayer/font"
+    #desktop file  FS#14770
+    install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
+    install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
+}
+
+package_mencoder() {
+    pkgdesc="Free command line video decoding, encoding and filtering tool"
+    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
+    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis')
+
+    cd "$srcdir/$pkgbase"
+    make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
+    find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
+}

Deleted: extra-i686/cdio-includes.patch
===================================================================
--- extra-i686/cdio-includes.patch	2013-05-14 23:48:31 UTC (rev 185551)
+++ extra-i686/cdio-includes.patch	2013-05-14 23:48:58 UTC (rev 185552)
@@ -1,43 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35421)
-+++ configure	(working copy)
-@@ -5968,8 +5968,8 @@
-         cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
-     void *test = cdda_verbose_set;
-     printf("%s\n", CDIO_VERSION);
-Index: gui/win32/interface.c
-===================================================================
---- gui/win32/interface.c	(revision 35421)
-+++ gui/win32/interface.c	(working copy)
-@@ -24,7 +24,7 @@
- #include "config.h"
- 
- #if defined(CONFIG_LIBCDIO)
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #elif defined(CONFIG_CDDA)
- #include <cdda_interface.h>
- #endif
-Index: stream/stream_cdda.c
-===================================================================
---- stream/stream_cdda.c	(revision 35421)
-+++ stream/stream_cdda.c	(working copy)
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>

Copied: mplayer/repos/extra-i686/cdio-includes.patch (from rev 185551, mplayer/trunk/cdio-includes.patch)
===================================================================
--- extra-i686/cdio-includes.patch	                        (rev 0)
+++ extra-i686/cdio-includes.patch	2013-05-14 23:48:58 UTC (rev 185552)
@@ -0,0 +1,43 @@
+Index: configure
+===================================================================
+--- configure	(revision 35421)
++++ configure	(working copy)
+@@ -5968,8 +5968,8 @@
+         cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <cdio/version.h>
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ int main(void) {
+     void *test = cdda_verbose_set;
+     printf("%s\n", CDIO_VERSION);
+Index: gui/win32/interface.c
+===================================================================
+--- gui/win32/interface.c	(revision 35421)
++++ gui/win32/interface.c	(working copy)
+@@ -24,7 +24,7 @@
+ #include "config.h"
+ 
+ #if defined(CONFIG_LIBCDIO)
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #elif defined(CONFIG_CDDA)
+ #include <cdda_interface.h>
+ #endif
+Index: stream/stream_cdda.c
+===================================================================
+--- stream/stream_cdda.c	(revision 35421)
++++ stream/stream_cdda.c	(working copy)
+@@ -21,8 +21,8 @@
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+ #else
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>

Deleted: extra-i686/mplayer.desktop
===================================================================
--- extra-i686/mplayer.desktop	2013-05-14 23:48:31 UTC (rev 185551)
+++ extra-i686/mplayer.desktop	2013-05-14 23:48:58 UTC (rev 185552)
@@ -1,21 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=MPlayer Media Player
-Name[ca]=Reproductor multimèdia MPlayer
-Name[pl]=MPlayer odtwarzacz multimedialny 
-GenericName=Multimedia player
-Comment=Play movies and songs
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lecteur multimédia
-Comment[it]=Lettore multimediale
-Comment[zh]=多媒体播放器
-Comment[pl]=Odtwarzaj filmy i muzykę
-Icon=mplayer
-TryExec=mplayer
-Exec=mplayer %F
-Terminal=false
-NoDisplay=true
-Categories=GTK;AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;

Copied: mplayer/repos/extra-i686/mplayer.desktop (from rev 185551, mplayer/trunk/mplayer.desktop)
===================================================================
--- extra-i686/mplayer.desktop	                        (rev 0)
+++ extra-i686/mplayer.desktop	2013-05-14 23:48:58 UTC (rev 185552)
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Type=Application
+Name=MPlayer Media Player
+Name[ca]=Reproductor multimèdia MPlayer
+Name[pl]=MPlayer odtwarzacz multimedialny 
+GenericName=Multimedia player
+Comment=Play movies and songs
+Comment[ca]=Reproduïu vídeos i cançons
+Comment[de]=Filme und Musik abspielen
+Comment[es]=Reproduzca vídeos y canciones
+Comment[fr]=Lecteur multimédia
+Comment[it]=Lettore multimediale
+Comment[zh]=多媒体播放器
+Comment[pl]=Odtwarzaj filmy i muzykę
+Icon=mplayer
+TryExec=mplayer
+Exec=mplayer %F
+Terminal=false
+NoDisplay=true
+Categories=GTK;AudioVideo;Audio;Video;Player;TV;
+MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;

Deleted: extra-i686/mplayer.install
===================================================================
--- extra-i686/mplayer.install	2013-05-14 23:48:31 UTC (rev 185551)
+++ extra-i686/mplayer.install	2013-05-14 23:48:58 UTC (rev 185552)
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: mplayer/repos/extra-i686/mplayer.install (from rev 185551, mplayer/trunk/mplayer.install)
===================================================================
--- extra-i686/mplayer.install	                        (rev 0)
+++ extra-i686/mplayer.install	2013-05-14 23:48:58 UTC (rev 185552)
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-i686/mplayer.png
===================================================================
(Binary files differ)

Copied: mplayer/repos/extra-i686/mplayer.png (from rev 185551, mplayer/trunk/mplayer.png)
===================================================================
(Binary files differ)

Copied: mplayer/repos/extra-i686/subreader-fix-srt-parsing.patch (from rev 185551, mplayer/trunk/subreader-fix-srt-parsing.patch)
===================================================================
--- extra-i686/subreader-fix-srt-parsing.patch	                        (rev 0)
+++ extra-i686/subreader-fix-srt-parsing.patch	2013-05-14 23:48:58 UTC (rev 185552)
@@ -0,0 +1,60 @@
+From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001
+From: wm4 <wm4 at nowhere>
+Date: Tue, 30 Apr 2013 00:09:31 +0200
+Subject: [PATCH] subreader: fix out of bound write access when parsing .srt
+
+This broke .srt subtitles on gcc-4.8. The breakage was relatively
+subtle: it set all hour components to 0, while everything else was
+parsed successfully.
+
+But the problem is really that sscanf wrote 1 byte past the sep
+variable (or more, for invalid/specially prepared input). The %[..]
+format specifier is unbounded. Fix that by letting sscanf drop the
+parsed contents with "*", and also make it skip only one input
+character by adding "1" (=> "%*1[...").
+
+The out of bound write could easily lead to security issues.
+
+Also, this change makes .srt subtitle parsing slightly more strict.
+Strictly speaking this is an unrelated change, but do it anyway. It's
+more correct.
+---
+ sub/subreader.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+ (foutrelis: adjusted variable names in first hunk to apply to mplayer)
+
+diff --git a/sub/subreader.c b/sub/subreader.c
+index 23da4c7..0f1b6c9 100644
+--- a/sub/subreader.c
++++ b/sub/subreader.c
+@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current,
+     int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0;
+ 
+     while (!current->text[0]) {
+-        char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep;
++        char line[LINE_LEN + 1], full_line[LINE_LEN + 1];
+         int i;
+ 
+         /* Parse SubRip header */
+         if (!stream_read_line(st, line, LINE_LEN, utf16))
+             return NULL;
+-        if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",
+-                     &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10)
++        if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",
++                     &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8)
+             continue;
+ 
+         current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10;
+@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current,
+         return sub_ass_read_line_subviewer(st, current, args);
+     while (!current->text[0]) {
+ 	if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
+-	if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
++	if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
+ 	    continue;
+ 	current->start = a1*360000+a2*6000+a3*100+a4/10;
+ 	current->end   = b1*360000+b2*6000+b3*100+b4/10;
+-- 
+1.8.1.6
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-05-14 23:48:31 UTC (rev 185551)
+++ extra-x86_64/PKGBUILD	2013-05-14 23:48:58 UTC (rev 185552)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgbase=mplayer
-pkgname=('mplayer' 'mencoder')
-pkgver=35920
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
-'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
-license=('GPL')
-url="http://www.mplayerhq.hu/"
-options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/packages/$pkgbase/$pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch)
-md5sums=('5f96e829d711e7d1ea65e324710dca50'
-         'c0d6ef795cf6de48e3b87ff7c23f0319'
-         '7b5be7191aafbea64218dc4916343bbc')
-
-build() {
-    cd "$srcdir/$pkgbase"
-    patch -Np0 -i ../cdio-includes.patch
-
-    ./configure --prefix=/usr \
-        --enable-runtime-cpudetection \
-        --disable-gui \
-        --disable-arts \
-        --disable-liblzo \
-        --disable-speex \
-        --disable-openal \
-        --disable-libdv \
-        --disable-musepack \
-        --disable-esd \
-        --disable-mga \
-        --disable-ass-internal \
-        --disable-cdparanoia \
-        --enable-xvmc \
-        --enable-radio \
-        --enable-radio-capture \
-        --language=all \
-        --confdir=/etc/mplayer 
-    [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
-
-    make
-}
-
-package_mplayer() {
-    pkgdesc="A movie player for linux"
-    install=mplayer.install
-    backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
-    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-    'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia')
-
-    cd "$srcdir/$pkgbase"
-
-    make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
-    install -dm755 "$pkgdir/usr/share/mplayer/"
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
-    rm -rf "$pkgdir/usr/share/mplayer/font"
-    #desktop file  FS#14770
-    install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
-    install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
-}
-
-package_mencoder() {
-    pkgdesc="Free command line video decoding, encoding and filtering tool"
-    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis')
-
-    cd "$srcdir/$pkgbase"
-    make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
-    find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
-}

Copied: mplayer/repos/extra-x86_64/PKGBUILD (from rev 185551, mplayer/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-05-14 23:48:58 UTC (rev 185552)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgbase=mplayer
+pkgname=('mplayer' 'mencoder')
+pkgver=35920
+pkgrel=3
+arch=('i686' 'x86_64')
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
+'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
+license=('GPL')
+url="http://www.mplayerhq.hu/"
+options=(!buildflags !emptydirs)
+source=(ftp://ftp.archlinux.org/other/packages/$pkgbase/$pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch subreader-fix-srt-parsing.patch)
+md5sums=('5f96e829d711e7d1ea65e324710dca50'
+         'c0d6ef795cf6de48e3b87ff7c23f0319'
+         '7b5be7191aafbea64218dc4916343bbc'
+         '7cb6019018a95dcc3d1231e1aaa8bbdb')
+
+prepare() {
+    cd "$srcdir/$pkgbase"
+
+    patch -Np0 -i ../cdio-includes.patch
+
+    # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139
+    patch -Np1 -i ../subreader-fix-srt-parsing.patch
+}
+
+build() {
+    cd "$srcdir/$pkgbase"
+
+    ./configure --prefix=/usr \
+        --enable-runtime-cpudetection \
+        --disable-gui \
+        --disable-arts \
+        --disable-liblzo \
+        --disable-speex \
+        --disable-openal \
+        --disable-libdv \
+        --disable-musepack \
+        --disable-esd \
+        --disable-mga \
+        --disable-ass-internal \
+        --disable-cdparanoia \
+        --enable-xvmc \
+        --enable-radio \
+        --enable-radio-capture \
+        --language=all \
+        --confdir=/etc/mplayer 
+    [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+
+    make
+}
+
+package_mplayer() {
+    pkgdesc="A movie player for linux"
+    install=mplayer.install
+    backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
+    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+    'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia')
+
+    cd "$srcdir/$pkgbase"
+
+    make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
+    install -dm755 "$pkgdir/usr/share/mplayer/"
+    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
+    rm -rf "$pkgdir/usr/share/mplayer/font"
+    #desktop file  FS#14770
+    install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
+    install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
+}
+
+package_mencoder() {
+    pkgdesc="Free command line video decoding, encoding and filtering tool"
+    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
+    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis')
+
+    cd "$srcdir/$pkgbase"
+    make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
+    find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
+}

Deleted: extra-x86_64/cdio-includes.patch
===================================================================
--- extra-x86_64/cdio-includes.patch	2013-05-14 23:48:31 UTC (rev 185551)
+++ extra-x86_64/cdio-includes.patch	2013-05-14 23:48:58 UTC (rev 185552)
@@ -1,43 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35421)
-+++ configure	(working copy)
-@@ -5968,8 +5968,8 @@
-         cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
-     void *test = cdda_verbose_set;
-     printf("%s\n", CDIO_VERSION);
-Index: gui/win32/interface.c
-===================================================================
---- gui/win32/interface.c	(revision 35421)
-+++ gui/win32/interface.c	(working copy)
-@@ -24,7 +24,7 @@
- #include "config.h"
- 
- #if defined(CONFIG_LIBCDIO)
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #elif defined(CONFIG_CDDA)
- #include <cdda_interface.h>
- #endif
-Index: stream/stream_cdda.c
-===================================================================
---- stream/stream_cdda.c	(revision 35421)
-+++ stream/stream_cdda.c	(working copy)
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>

Copied: mplayer/repos/extra-x86_64/cdio-includes.patch (from rev 185551, mplayer/trunk/cdio-includes.patch)
===================================================================
--- extra-x86_64/cdio-includes.patch	                        (rev 0)
+++ extra-x86_64/cdio-includes.patch	2013-05-14 23:48:58 UTC (rev 185552)
@@ -0,0 +1,43 @@
+Index: configure
+===================================================================
+--- configure	(revision 35421)
++++ configure	(working copy)
+@@ -5968,8 +5968,8 @@
+         cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <cdio/version.h>
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ int main(void) {
+     void *test = cdda_verbose_set;
+     printf("%s\n", CDIO_VERSION);
+Index: gui/win32/interface.c
+===================================================================
+--- gui/win32/interface.c	(revision 35421)
++++ gui/win32/interface.c	(working copy)
+@@ -24,7 +24,7 @@
+ #include "config.h"
+ 
+ #if defined(CONFIG_LIBCDIO)
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #elif defined(CONFIG_CDDA)
+ #include <cdda_interface.h>
+ #endif
+Index: stream/stream_cdda.c
+===================================================================
+--- stream/stream_cdda.c	(revision 35421)
++++ stream/stream_cdda.c	(working copy)
+@@ -21,8 +21,8 @@
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+ #else
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>

Deleted: extra-x86_64/mplayer.desktop
===================================================================
--- extra-x86_64/mplayer.desktop	2013-05-14 23:48:31 UTC (rev 185551)
+++ extra-x86_64/mplayer.desktop	2013-05-14 23:48:58 UTC (rev 185552)
@@ -1,21 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=MPlayer Media Player
-Name[ca]=Reproductor multimèdia MPlayer
-Name[pl]=MPlayer odtwarzacz multimedialny 
-GenericName=Multimedia player
-Comment=Play movies and songs
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lecteur multimédia
-Comment[it]=Lettore multimediale
-Comment[zh]=多媒体播放器
-Comment[pl]=Odtwarzaj filmy i muzykę
-Icon=mplayer
-TryExec=mplayer
-Exec=mplayer %F
-Terminal=false
-NoDisplay=true
-Categories=GTK;AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;

Copied: mplayer/repos/extra-x86_64/mplayer.desktop (from rev 185551, mplayer/trunk/mplayer.desktop)
===================================================================
--- extra-x86_64/mplayer.desktop	                        (rev 0)
+++ extra-x86_64/mplayer.desktop	2013-05-14 23:48:58 UTC (rev 185552)
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Type=Application
+Name=MPlayer Media Player
+Name[ca]=Reproductor multimèdia MPlayer
+Name[pl]=MPlayer odtwarzacz multimedialny 
+GenericName=Multimedia player
+Comment=Play movies and songs
+Comment[ca]=Reproduïu vídeos i cançons
+Comment[de]=Filme und Musik abspielen
+Comment[es]=Reproduzca vídeos y canciones
+Comment[fr]=Lecteur multimédia
+Comment[it]=Lettore multimediale
+Comment[zh]=多媒体播放器
+Comment[pl]=Odtwarzaj filmy i muzykę
+Icon=mplayer
+TryExec=mplayer
+Exec=mplayer %F
+Terminal=false
+NoDisplay=true
+Categories=GTK;AudioVideo;Audio;Video;Player;TV;
+MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;

Deleted: extra-x86_64/mplayer.install
===================================================================
--- extra-x86_64/mplayer.install	2013-05-14 23:48:31 UTC (rev 185551)
+++ extra-x86_64/mplayer.install	2013-05-14 23:48:58 UTC (rev 185552)
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: mplayer/repos/extra-x86_64/mplayer.install (from rev 185551, mplayer/trunk/mplayer.install)
===================================================================
--- extra-x86_64/mplayer.install	                        (rev 0)
+++ extra-x86_64/mplayer.install	2013-05-14 23:48:58 UTC (rev 185552)
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-x86_64/mplayer.png
===================================================================
(Binary files differ)

Copied: mplayer/repos/extra-x86_64/mplayer.png (from rev 185551, mplayer/trunk/mplayer.png)
===================================================================
(Binary files differ)

Copied: mplayer/repos/extra-x86_64/subreader-fix-srt-parsing.patch (from rev 185551, mplayer/trunk/subreader-fix-srt-parsing.patch)
===================================================================
--- extra-x86_64/subreader-fix-srt-parsing.patch	                        (rev 0)
+++ extra-x86_64/subreader-fix-srt-parsing.patch	2013-05-14 23:48:58 UTC (rev 185552)
@@ -0,0 +1,60 @@
+From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001
+From: wm4 <wm4 at nowhere>
+Date: Tue, 30 Apr 2013 00:09:31 +0200
+Subject: [PATCH] subreader: fix out of bound write access when parsing .srt
+
+This broke .srt subtitles on gcc-4.8. The breakage was relatively
+subtle: it set all hour components to 0, while everything else was
+parsed successfully.
+
+But the problem is really that sscanf wrote 1 byte past the sep
+variable (or more, for invalid/specially prepared input). The %[..]
+format specifier is unbounded. Fix that by letting sscanf drop the
+parsed contents with "*", and also make it skip only one input
+character by adding "1" (=> "%*1[...").
+
+The out of bound write could easily lead to security issues.
+
+Also, this change makes .srt subtitle parsing slightly more strict.
+Strictly speaking this is an unrelated change, but do it anyway. It's
+more correct.
+---
+ sub/subreader.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+ (foutrelis: adjusted variable names in first hunk to apply to mplayer)
+
+diff --git a/sub/subreader.c b/sub/subreader.c
+index 23da4c7..0f1b6c9 100644
+--- a/sub/subreader.c
++++ b/sub/subreader.c
+@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current,
+     int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0;
+ 
+     while (!current->text[0]) {
+-        char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep;
++        char line[LINE_LEN + 1], full_line[LINE_LEN + 1];
+         int i;
+ 
+         /* Parse SubRip header */
+         if (!stream_read_line(st, line, LINE_LEN, utf16))
+             return NULL;
+-        if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",
+-                     &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10)
++        if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",
++                     &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8)
+             continue;
+ 
+         current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10;
+@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current,
+         return sub_ass_read_line_subviewer(st, current, args);
+     while (!current->text[0]) {
+ 	if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
+-	if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
++	if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
+ 	    continue;
+ 	current->start = a1*360000+a2*6000+a3*100+a4/10;
+ 	current->end   = b1*360000+b2*6000+b3*100+b4/10;
+-- 
+1.8.1.6
+



More information about the arch-commits mailing list