virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avconv: rename output_packet() to process_input_packet()

Browse Source 
It more accurately describes what this function does
This commit is contained in:
Anton Khirnov 2013-11-25 09:57:54 +01:00
parent 159a06dfc8
commit aa51b0492b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
avconv.c
View File

@ -1354,7 +1354,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
} }
/* pkt = NULL means EOF (needed to flush decoder buffers) */ /* 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 i;
int got_output; int got_output;
@ -2360,7 +2360,7 @@ static int process_input(void)
for (i = 0; i < ifile->nb_streams; i++) { for (i = 0; i < ifile->nb_streams; i++) {
ist = input_streams[ifile->ist_index + i]; ist = input_streams[ifile->ist_index + i];
if (ist->decoding_needed) if (ist->decoding_needed)
output_packet(ist, NULL); process_input_packet(ist, NULL);
/* mark all outputs that don't go through lavfi as finished */ /* mark all outputs that don't go through lavfi as finished */
for (j = 0; j < nb_output_streams; j++) { 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) { if (ret < 0) {
av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n", av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n",
ist->file_index, ist->st->index); ist->file_index, ist->st->index);
@ -2509,7 +2509,7 @@ static int transcode(void)
for (i = 0; i < nb_input_streams; i++) { for (i = 0; i < nb_input_streams; i++) {
ist = input_streams[i]; ist = input_streams[i];
if (!input_files[ist->file_index]->eof_reached && ist->decoding_needed) { if (!input_files[ist->file_index]->eof_reached && ist->decoding_needed) {
output_packet(ist, NULL); process_input_packet(ist, NULL);
} }
} }
poll_filters(); poll_filters();