diff options
| author | Max Kellermann <max@duempel.org> | 2010-01-18 10:21:57 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2010-01-18 10:21:57 +0100 |
| commit | ca1fc13116cbac10711455b4e57e242b967c6f6e (patch) | |
| tree | 35b734bbb1ada8fc04f8c1562d08ecc68636308d /src/decoder/ffmpeg_decoder_plugin.c | |
| parent | 9cb7760c5eb63cb6b7034ec9d2cdf9af2f198652 (diff) | |
| download | mpd-ca1fc13116cbac10711455b4e57e242b967c6f6e.tar.gz mpd-ca1fc13116cbac10711455b4e57e242b967c6f6e.tar.xz mpd-ca1fc13116cbac10711455b4e57e242b967c6f6e.zip | |
decoder_api: removed function decoder_get_uri()
Use input_stream.uri.
Diffstat (limited to 'src/decoder/ffmpeg_decoder_plugin.c')
| -rw-r--r-- | src/decoder/ffmpeg_decoder_plugin.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index 41c4648b8..1ecc9e013 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -162,7 +162,7 @@ append_uri_suffix(struct ffmpeg_stream *stream, const char *uri) } static bool -ffmpeg_helper(const char *uri, struct input_stream *input, +ffmpeg_helper(struct input_stream *input, bool (*callback)(struct ffmpeg_context *ctx), struct ffmpeg_context *ctx) { @@ -175,8 +175,8 @@ ffmpeg_helper(const char *uri, struct input_stream *input, }; bool ret; - if (uri != NULL) - append_uri_suffix(&stream, uri); + if (input->uri != NULL) + append_uri_suffix(&stream, input->uri); stream.input = input; if (ctx && ctx->decoder) { @@ -385,8 +385,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input) ctx.input = input; ctx.decoder = decoder; - ffmpeg_helper(decoder_get_uri(decoder), input, - ffmpeg_decode_internal, &ctx); + ffmpeg_helper(input, ffmpeg_decode_internal, &ctx); } #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(31<<8)+0) @@ -459,7 +458,7 @@ ffmpeg_stream_tag(struct input_stream *is) ctx.decoder = NULL; ctx.tag = tag_new(); - ret = ffmpeg_helper(NULL, is, ffmpeg_tag_internal, &ctx); + ret = ffmpeg_helper(is, ffmpeg_tag_internal, &ctx); if (!ret) { tag_free(ctx.tag); ctx.tag = NULL; |