aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroblique <psyberbits@gmail.com>2011-07-03 14:54:56 +0200
committerMax Kellermann <max@duempel.org>2011-07-03 14:54:56 +0200
commit8d1c7ca2065444dfe2da432a30c95782e3ead48d (patch)
treeed07c4841b663c0ec859df4d67671939d3ee7ec2
parent52b8e0f9ecdc15c90266d6a50a5ebd9a1038ebdb (diff)
downloadmpd-8d1c7ca2065444dfe2da432a30c95782e3ead48d.tar.gz
mpd-8d1c7ca2065444dfe2da432a30c95782e3ead48d.tar.xz
mpd-8d1c7ca2065444dfe2da432a30c95782e3ead48d.zip
ffmpeg: workaround for semantic API change in recent ffmpeg versions
Diffstat (limited to '')
-rw-r--r--NEWS2
-rw-r--r--src/decoder/ffmpeg_decoder_plugin.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index f38358a83..208ba1069 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
ver 0.16.4 (2010/??/??)
+* decoder:
+ - ffmpeg: workaround for semantic API change in recent ffmpeg versions
ver 0.16.3 (2011/06/04)
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 6d794db49..156853faf 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -321,7 +321,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
}
//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 @@ ffmpeg_stream_tag(struct input_stream *is)
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);