diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:19:54 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:19:54 -0300 |
| commit | 730bda0e79d3e122d665663a18e0c973d7209236 (patch) | |
| tree | 251b00a85c7bbc2e3ee21102c5c16c1054cf4669 /extra/mpd | |
| parent | cfe7b034671297c6bba5e91867d98e182c683ded (diff) | |
| parent | fe769389426a6aa5a2878bf7dcfc6144717e1e93 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gcolor2/PKGBUILD
community/perl-list-moreutils/PKGBUILD
extra/boost/PKGBUILD
extra/cdrkit/PKGBUILD
extra/ettercap/PKGBUILD
extra/lame/PKGBUILD
extra/sdl/PKGBUILD
extra/unzip/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/caribou/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gtkmm3/PKGBUILD
gnome-unstable/yelp/PKGBUILD
Diffstat (limited to 'extra/mpd')
| -rw-r--r-- | extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch b/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch deleted file mode 100644 index a945a0a6a..000000000 --- a/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c ---- mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c 2011-06-04 17:36:33.000000000 +0300 -+++ mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c 2011-06-24 18:18:51.840218251 +0300 -@@ -321,7 +321,7 @@ - } - - //ffmpeg works with ours "fileops" helper -- AVFormatContext *format_context; -+ AVFormatContext *format_context = NULL; - if (av_open_input_stream(&format_context, stream->io, input->uri, - input_format, NULL) != 0) { - g_warning("Open failed\n"); -@@ -470,7 +470,7 @@ - if (stream == NULL) - return NULL; - -- AVFormatContext *f; -+ AVFormatContext *f = NULL; - if (av_open_input_stream(&f, stream->io, is->uri, - input_format, NULL) != 0) { - mpd_ffmpeg_stream_close(stream); |