oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ffmpeg: workaround for semantic API change in recent ffmpeg versions

This commit is contained in:
oblique 2011-07-03 14:54:56 +02:00 committed by Max Kellermann
parent 52b8e0f9ec
commit 8d1c7ca206
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.16.4 (2010/??/??) ver 0.16.4 (2010/??/??)
* decoder:
- ffmpeg: workaround for semantic API change in recent ffmpeg versions
ver 0.16.3 (2011/06/04) ver 0.16.3 (2011/06/04)

4
src/decoder/ffmpeg_decoder_plugin.c
View File

@ -321,7 +321,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
} }
//ffmpeg works with ours "fileops" helper //ffmpeg works with ours "fileops" helper
AVFormatContext *format_context; AVFormatContext *format_context = NULL;
if (av_open_input_stream(&format_context, stream->io, input->uri, if (av_open_input_stream(&format_context, stream->io, input->uri,
input_format, NULL) != 0) { input_format, NULL) != 0) {
g_warning("Open failed\n"); g_warning("Open failed\n");
@ -470,7 +470,7 @@ ffmpeg_stream_tag(struct input_stream *is)
if (stream == NULL) if (stream == NULL)
return NULL; return NULL;
AVFormatContext *f; AVFormatContext *f = NULL;
if (av_open_input_stream(&f, stream->io, is->uri, if (av_open_input_stream(&f, stream->io, is->uri,
input_format, NULL) != 0) { input_format, NULL) != 0) {
mpd_ffmpeg_stream_close(stream); mpd_ffmpeg_stream_close(stream);