[FFmpeg-cvslog] avconv: remove a now unused parameter from output_packet().
Anton Khirnov
git at videolan.org
Thu Nov 24 03:38:33 CET 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Nov 22 07:17:38 2011 +0100| [06d4e2fa5ae6d9dfe85d461194d38759acffb9f8] | committer: Anton Khirnov
avconv: remove a now unused parameter from output_packet().
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06d4e2fa5ae6d9dfe85d461194d38759acffb9f8
---
avconv.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/avconv.c b/avconv.c
index dfdeba6..be870a5 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);
More information about the ffmpeg-cvslog
mailing list