aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-25 09:57:54 +0100
committerAnton Khirnov <anton@khirnov.net>2014-08-13 17:24:18 +0000
commitaa51b0492bfced6d650fb5ff419e2b13fde6833d (patch)
treed8bac1e18d62cd58273fed554fcc7bd01596567a
parent159a06dfc83d189f753c4583583ddfb571552ff5 (diff)
downloadffmpeg-aa51b0492bfced6d650fb5ff419e2b13fde6833d.tar.gz
avconv: rename output_packet() to process_input_packet()
It more accurately describes what this function does
-rw-r--r--avconv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/avconv.c b/avconv.c
index 0ee76285f0..65f33b2d1e 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1354,7 +1354,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, const AVPacket *pkt)
+static int process_input_packet(InputStream *ist, const AVPacket *pkt)
{
int i;
int got_output;
@@ -2360,7 +2360,7 @@ static int process_input(void)
for (i = 0; i < ifile->nb_streams; i++) {
ist = input_streams[ifile->ist_index + i];
if (ist->decoding_needed)
- output_packet(ist, NULL);
+ process_input_packet(ist, NULL);
/* mark all outputs that don't go through lavfi as finished */
for (j = 0; j < nb_output_streams; j++) {
@@ -2436,7 +2436,7 @@ static int process_input(void)
}
}
- ret = output_packet(ist, &pkt);
+ ret = process_input_packet(ist, &pkt);
if (ret < 0) {
av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n",
ist->file_index, ist->st->index);
@@ -2509,7 +2509,7 @@ static int transcode(void)
for (i = 0; i < nb_input_streams; i++) {
ist = input_streams[i];
if (!input_files[ist->file_index]->eof_reached && ist->decoding_needed) {
- output_packet(ist, NULL);
+ process_input_packet(ist, NULL);
}
}
poll_filters();