From 5024f0b6cc5151b28cc2e7be1648c2664595e86e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 30 Oct 2008 19:09:20 +0100 Subject: ffmpeg: pass input_stream pointer to decoder_data() decoder_data() uses wait times to let the input stream continue its transfer. --- src/decoder/ffmpeg_plugin.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c index 57e7325c4..dde06f4d3 100644 --- a/src/decoder/ffmpeg_plugin.c +++ b/src/decoder/ffmpeg_plugin.c @@ -214,7 +214,8 @@ ffmpeg_try_decode(struct input_stream *input) } static enum decoder_command -ffmpeg_send_packet(struct decoder *decoder, const AVPacket *packet, +ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is, + const AVPacket *packet, AVCodecContext *codec_context, const AVRational *time_base) { @@ -238,7 +239,7 @@ ffmpeg_send_packet(struct decoder *decoder, const AVPacket *packet, assert(audio_size >= 0); - return decoder_data(decoder, NULL, 1, + return decoder_data(decoder, is, is->seekable, audio_buf, audio_size, position, codec_context->bit_rate / 1000, NULL); @@ -278,7 +279,8 @@ ffmpeg_decode_internal(BasePtrs *base) break; if (packet.stream_index == base->audioStream) - cmd = ffmpeg_send_packet(decoder, &packet, aCodecCtx, + cmd = ffmpeg_send_packet(decoder, base->input, + &packet, aCodecCtx, &pFormatCtx->streams[base->audioStream]->time_base); else cmd = decoder_get_command(decoder); -- cgit v1.2.3