* commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d': avconv: rename output_packet() to process_input_packet() Conflicts: ffmpeg.c
Unified · Split
| @@ -2057,7 +2057,7 @@ out: · 2056 unmodified lines | ||
| 2057 | 2057 | } |
| 2058 | 2058 | |
| 2059 | 2059 | /* pkt = NULL means EOF (needed to flush decoder buffers) */ |
| 2060 | −static int output_packet(InputStream *ist, const AVPacket *pkt) | |
| 2060 | +static int process_input_packet(InputStream *ist, const AVPacket *pkt) | |
| 2061 | 2061 | { |
| 2062 | 2062 | int ret = 0, i; |
| 2063 | 2063 | int got_output = 0; |
| @@ -3340,7 +3340,7 @@ static int process_input(int file_index) · 1276 unmodified lines | ||
| 3340 | 3340 | for (i = 0; i < ifile->nb_streams; i++) { |
| 3341 | 3341 | ist = input_streams[ifile->ist_index + i]; |
| 3342 | 3342 | if (ist->decoding_needed) { |
| 3343 | − ret = output_packet(ist, NULL); | |
| 3343 | + ret = process_input_packet(ist, NULL); | |
| 3344 | 3344 | if (ret>0) |
| 3345 | 3345 | return 0; |
| 3346 | 3346 | } |
| @@ -3521,7 +3521,7 @@ static int process_input(int file_index) · 174 unmodified lines | ||
| 3521 | 3521 | |
| 3522 | 3522 | sub2video_heartbeat(ist, pkt.pts); |
| 3523 | 3523 | |
| 3524 | − ret = output_packet(ist, &pkt); | |
| 3524 | + ret = process_input_packet(ist, &pkt); | |
| 3525 | 3525 | if (ret < 0) { |
| 3526 | 3526 | av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d: %s\n", |
| 3527 | 3527 | ist->file_index, ist->st->index, av_err2str(ret)); |
| @@ -3687,7 +3687,7 @@ static int transcode(void) · 159 unmodified lines | ||
| 3687 | 3687 | for (i = 0; i < nb_input_streams; i++) { |
| 3688 | 3688 | ist = input_streams[i]; |
| 3689 | 3689 | if (!input_files[ist->file_index]->eof_reached && ist->decoding_needed) { |
| 3690 | − output_packet(ist, NULL); | |
| 3690 | + process_input_packet(ist, NULL); | |
| 3691 | 3691 | } |
| 3692 | 3692 | } |
| 3693 | 3693 | flush_encoders(); |