aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-11-22 07:17:38 +0100
committerAnton Khirnov <anton@khirnov.net>2011-11-23 22:03:32 +0100
commit06d4e2fa5ae6d9dfe85d461194d38759acffb9f8 (patch)
tree823924ff7843cf07651a3a9edbeb81a8dc56cb96
parent8b0268a85388d26c8e2e70e6d714c8ff54e50eae (diff)
downloadffmpeg-06d4e2fa5ae6d9dfe85d461194d38759acffb9f8.tar.gz
avconv: remove a now unused parameter from output_packet().
-rw-r--r--avconv.c6
1 files changed, 3 insertions, 3 deletions
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);