From: Anton Khirnov Date: Tue, 22 Nov 2011 06:17:38 +0000 (+0100) Subject: avconv: remove a now unused parameter from output_packet(). X-Git-Tag: android-x86-4.4-r1~8529^2~4482 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=06d4e2fa5ae6d9dfe85d461194d38759acffb9f8;p=android-x86%2Fexternal-ffmpeg.git avconv: remove a now unused parameter from output_packet(). --- diff --git a/avconv.c b/avconv.c index dfdeba66ac..be870a5273 100644 --- a/avconv.c +++ b/avconv.c @@ -1836,7 +1836,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output) } /* pkt = NULL means EOF (needed to flush decoder buffers) */ -static int output_packet(InputStream *ist, int ist_index, +static int output_packet(InputStream *ist, OutputStream *ost_table, int nb_ostreams, const AVPacket *pkt) { @@ -2513,7 +2513,7 @@ static int transcode(OutputFile *output_files, } //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size); - if (output_packet(ist, ist_index, output_streams, nb_output_streams, &pkt) < 0) { + if (output_packet(ist, output_streams, nb_output_streams, &pkt) < 0) { av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n", ist->file_index, ist->st->index); @@ -2534,7 +2534,7 @@ static int transcode(OutputFile *output_files, for (i = 0; i < nb_input_streams; i++) { ist = &input_streams[i]; if (ist->decoding_needed) { - output_packet(ist, i, output_streams, nb_output_streams, NULL); + output_packet(ist, output_streams, nb_output_streams, NULL); } } flush_encoders(output_streams, nb_output_streams);