History

avconv: rename output_packet() to process_input_packet()

It more accurately describes what this function does

Anton Khirnov committed 12 years ago

Commit aa51b041 parent 159a06d1 file · +4 −4Browse files

Unified · Split

avconv.c+4−4
@@ -1354,7 +1354,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output) · 1353 unmodified lines
1354}1354}
1355 1355
1356/* pkt = NULL means EOF (needed to flush decoder buffers) */1356/* pkt = NULL means EOF (needed to flush decoder buffers) */
1357static int output_packet(InputStream *ist, const AVPacket *pkt)1357static int process_input_packet(InputStream *ist, const AVPacket *pkt)
1358{1358{
1359 int i;1359 int i;
1360 int got_output;1360 int got_output;
@@ -2360,7 +2360,7 @@ static int process_input(void) · 999 unmodified lines
2360 for (i = 0; i < ifile->nb_streams; i++) {2360 for (i = 0; i < ifile->nb_streams; i++) {
2361 ist = input_streams[ifile->ist_index + i];2361 ist = input_streams[ifile->ist_index + i];
2362 if (ist->decoding_needed)2362 if (ist->decoding_needed)
2363 output_packet(ist, NULL);2363 process_input_packet(ist, NULL);
2364 2364
2365 /* mark all outputs that don't go through lavfi as finished */2365 /* mark all outputs that don't go through lavfi as finished */
2366 for (j = 0; j < nb_output_streams; j++) {2366 for (j = 0; j < nb_output_streams; j++) {
@@ -2436,7 +2436,7 @@ static int process_input(void) · 69 unmodified lines
2436 }2436 }
2437 }2437 }
2438 2438
2439 ret = output_packet(ist, &pkt);2439 ret = process_input_packet(ist, &pkt);
2440 if (ret < 0) {2440 if (ret < 0) {
2441 av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n",2441 av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n",
2442 ist->file_index, ist->st->index);2442 ist->file_index, ist->st->index);
@@ -2509,7 +2509,7 @@ static int transcode(void) · 66 unmodified lines
2509 for (i = 0; i < nb_input_streams; i++) {2509 for (i = 0; i < nb_input_streams; i++) {
2510 ist = input_streams[i];2510 ist = input_streams[i];
2511 if (!input_files[ist->file_index]->eof_reached && ist->decoding_needed) {2511 if (!input_files[ist->file_index]->eof_reached && ist->decoding_needed) {
2512 output_packet(ist, NULL);2512 process_input_packet(ist, NULL);
2513 }2513 }
2514 }2514 }
2515 poll_filters();2515 poll_filters();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t