Gentoo Archives: gentoo-commits

From: "Christoph Mende (angelos)" <angelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/mpd/files: mpd-0.16.3-ffmpeg.patch
Date: Sun, 03 Jul 2011 10:30:45
Message-Id: 20110703103035.9209020051@flycatcher.gentoo.org
1 angelos 11/07/03 10:30:35
2
3 Added: mpd-0.16.3-ffmpeg.patch
4 Log:
5 Fix segfault with recent ffmpeg versions (bug #373423 by Mike MacDonald)
6
7 (Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch?rev=1.1&content-type=text/plain
14
15 Index: mpd-0.16.3-ffmpeg.patch
16 ===================================================================
17 diff -ur mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c
18 --- mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c 2011-06-04 17:36:33.000000000 +0300
19 +++ mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c 2011-06-24 18:18:51.840218251 +0300
20 @@ -321,7 +321,7 @@
21 }
22
23 //ffmpeg works with ours "fileops" helper
24 - AVFormatContext *format_context;
25 + AVFormatContext *format_context = NULL;
26 if (av_open_input_stream(&format_context, stream->io, input->uri,
27 input_format, NULL) != 0) {
28 g_warning("Open failed\n");
29 @@ -470,7 +470,7 @@
30 if (stream == NULL)
31 return NULL;
32
33 - AVFormatContext *f;
34 + AVFormatContext *f = NULL;
35 if (av_open_input_stream(&f, stream->io, is->uri,
36 input_format, NULL) != 0) {
37 mpd_ffmpeg_stream_close(stream);