diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-03 13:57:40 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-03 13:57:40 -0300 |
| commit | cdd88c937bb1fd3bf6de0b847101524a2d5c9022 (patch) | |
| tree | 3eeb67878db60db79eb21dc2232377e6b56a3add /extra/gstreamer0.10-base | |
| parent | b2e7dca27f9de046feecd59ecfc93cd17bca8356 (diff) | |
| parent | b618c3d0693aec564c6746238fd05d94e31d3b76 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/asciijump/PKGBUILD
community/cairo-compmgr/PKGBUILD
community/cwiid/PKGBUILD
community/darcs/PKGBUILD
community/gadmin-samba/PKGBUILD
community/gstm/PKGBUILD
community/haskell-dbus/PKGBUILD
community/haskell-mmap/PKGBUILD
community/lastfm-client/PKGBUILD
community/libtar/PKGBUILD
community/mget/PKGBUILD
community/nexuiz/PKGBUILD
community/pstreams/PKGBUILD
community/pyglet/PKGBUILD
community/python-html5lib/PKGBUILD
community/python-pychm/PKGBUILD
community/qoauth/PKGBUILD
community/quilt/PKGBUILD
community/stormbaancoureur/PKGBUILD
community/winegame/PKGBUILD
community/winestuff/PKGBUILD
community/xdg-user-dirs/PKGBUILD
core/libfetch/PKGBUILD
extra/acpi/PKGBUILD
extra/alex/PKGBUILD
extra/allegro/PKGBUILD
extra/capi4k-utils/PKGBUILD
extra/erlang/PKGBUILD
extra/ettercap/PKGBUILD
extra/gftp/PKGBUILD
extra/gimp-refocus/PKGBUILD
extra/happy/PKGBUILD
extra/haskell-cgi/PKGBUILD
extra/haskell-deepseq/PKGBUILD
extra/haskell-fgl/PKGBUILD
extra/haskell-glut/PKGBUILD
extra/haskell-haskell-src/PKGBUILD
extra/haskell-html/PKGBUILD
extra/haskell-hunit/PKGBUILD
extra/haskell-opengl/PKGBUILD
extra/haskell-parallel/PKGBUILD
extra/haskell-platform/PKGBUILD
extra/haskell-quickcheck/PKGBUILD
extra/haskell-regex-base/PKGBUILD
extra/haskell-regex-compat/PKGBUILD
extra/haskell-regex-posix/PKGBUILD
extra/haskell-stm/PKGBUILD
extra/haskell-syb/PKGBUILD
extra/haskell-xhtml/PKGBUILD
extra/libnet/PKGBUILD
extra/linux_logo/PKGBUILD
extra/mailman/PKGBUILD
extra/midori/PKGBUILD
extra/ntrack/PKGBUILD
extra/pwgen/PKGBUILD
extra/qtcurve-gtk2/PKGBUILD
extra/qtcurve-kde4/PKGBUILD
extra/ristretto/PKGBUILD
extra/rxvt-unicode/PKGBUILD
extra/telepathy-sofiasip/PKGBUILD
extra/tightvnc/PKGBUILD
extra/vsftpd/PKGBUILD
extra/windowmaker-crm-git/PKGBUILD
libre/aufs2-libre/PKGBUILD
libre/calibre-libre/PKGBUILD
libre/calibre-libre/calibre-mount-helper
libre/calibre-libre/calibre.install
libre/calibre-libre/desktop_integration.patch
libre/ffmpeg-libre/PKGBUILD
mozilla-testing/iceweasel-libre/PKGBUILD
mozilla-testing/iceweasel-libre/libre.patch
mozilla-testing/iceweasel-libre/mozconfig
~lukeshu/openni-unstable/PKGBUILD
Diffstat (limited to 'extra/gstreamer0.10-base')
| -rw-r--r-- | extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch | 22 | ||||
| -rw-r--r-- | extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch | 21 |
2 files changed, 0 insertions, 43 deletions
diff --git a/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch b/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch deleted file mode 100644 index 8ba4c8ed3..000000000 --- a/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8bd3bdaf3768b3fb6adc85b3bc681fdce07b786e Mon Sep 17 00:00:00 2001 -From: Jonathan Liu <net147@gmail.com> -Date: Wed, 03 Aug 2011 08:18:29 +0000 -Subject: oggstream: Fix crashes with 0-byte vorbis packets - -Fixes bug #655574. ---- -diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c -index e843f48..77f39d4 100644 ---- a/ext/ogg/gstoggstream.c -+++ b/ext/ogg/gstoggstream.c -@@ -792,7 +792,7 @@ packet_duration_vorbis (GstOggStream * pad, ogg_packet * packet) - int size; - int duration; - -- if (packet->packet[0] & 1) -+ if (packet->bytes == 0 || packet->packet[0] & 1) - return 0; - - mode = (packet->packet[0] >> 1) & ((1 << pad->vorbis_log2_num_modes) - 1); --- -cgit v0.8.3-6-g21f6 diff --git a/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch b/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch deleted file mode 100644 index b9883d407..000000000 --- a/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 7d22d91fca6b9f24ca205eef98031f1ed6a44d33 Mon Sep 17 00:00:00 2001 -From: Philip Jägenstedt <philipj@opera.com> -Date: Tue, 26 Jul 2011 14:10:17 +0000 -Subject: theoradec: segfault on 0-byte ogg_packet in _chain_reverse - ---- -diff --git a/ext/theora/gsttheoradec.c b/ext/theora/gsttheoradec.c -index 96e12ee..25d68db 100644 ---- a/ext/theora/gsttheoradec.c -+++ b/ext/theora/gsttheoradec.c -@@ -1440,7 +1440,7 @@ theora_dec_chain_reverse (GstTheoraDec * dec, gboolean discont, GstBuffer * buf) - - /* if we copied a keyframe, flush and decode the decode queue */ - data = GST_BUFFER_DATA (gbuf); -- if ((data[0] & 0x40) == 0) { -+ if (data && (data[0] & 0x40) == 0) { - GST_DEBUG_OBJECT (dec, "copied keyframe"); - res = theora_dec_flush_decode (dec); - } --- -cgit v0.8.3-6-g21f6 |