diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-28 23:41:45 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-28 23:41:45 +0100 |
| commit | 76417d44464248949e7843eee0d5338a8e0a22ac (patch) | |
| tree | c8f6416505b7268ce4f3902660ba35f4e35d1c04 /src/decoder/FfmpegDecoderPlugin.cxx | |
| parent | cffc78ad6a978c8ef0afae4fbdd4b189612a7167 (diff) | |
InputStream: use std::string
Diffstat (limited to 'src/decoder/FfmpegDecoderPlugin.cxx')
| -rw-r--r-- | src/decoder/FfmpegDecoderPlugin.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx index e40813775..dd98b9686 100644 --- a/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/FfmpegDecoderPlugin.cxx @@ -395,7 +395,7 @@ ffmpeg_probe(struct decoder *decoder, struct input_stream *is) AVProbeData avpd; avpd.buf = buffer; avpd.buf_size = nbytes; - avpd.filename = is->uri; + avpd.filename = is->uri.c_str(); AVInputFormat *format = av_probe_input_format(&avpd, true); g_free(buffer); @@ -422,7 +422,8 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input) //ffmpeg works with ours "fileops" helper AVFormatContext *format_context = NULL; - if (mpd_ffmpeg_open_input(&format_context, stream->io, input->uri, + if (mpd_ffmpeg_open_input(&format_context, stream->io, + input->uri.c_str(), input_format) != 0) { g_warning("Open failed\n"); mpd_ffmpeg_stream_close(stream); @@ -581,7 +582,7 @@ ffmpeg_scan_stream(struct input_stream *is, return false; AVFormatContext *f = NULL; - if (mpd_ffmpeg_open_input(&f, stream->io, is->uri, + if (mpd_ffmpeg_open_input(&f, stream->io, is->uri.c_str(), input_format) != 0) { mpd_ffmpeg_stream_close(stream); return false; |