diff options
| author | Anton Khirnov <[email protected]> | 2023-07-12 19:49:43 +0200 |
|---|---|---|
| committer | Anton Khirnov <[email protected]> | 2023-07-15 11:02:11 +0200 |
| commit | 464a5e8e7681267501cb4a5e96ad040522a67d4e (patch) | |
| tree | 6fa1d686a7756fab2eb5b269d0d8a1803b92d02b | |
| parent | 5fe3914c391699c05cbd7a09f38f318d0452f1df (diff) | |
fftools/ffmpeg: handle error codes from process_input_packet()
None are returned for now, but that will change in future commits.
| -rw-r--r-- | fftools/ffmpeg.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 68924d21e0..dd7cfcf632 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1103,6 +1103,8 @@ static int process_input(int file_index) ret = process_input_packet(ist, NULL, 0); if (ret>0) return 0; + else if (ret < 0) + return ret; } /* mark all outputs that don't go through lavfi as finished */ @@ -1124,11 +1126,11 @@ static int process_input(int file_index) sub2video_heartbeat(ifile, pkt->pts, pkt->time_base); - process_input_packet(ist, pkt, 0); + ret = process_input_packet(ist, pkt, 0); av_packet_free(&pkt); - return 0; + return ret < 0 ? ret : 0; } /** @@ -1219,7 +1221,8 @@ static int transcode(int *err_rate_exceeded) float err_rate; if (!input_files[ist->file_index]->eof_reached) { - process_input_packet(ist, NULL, 0); + int err = process_input_packet(ist, NULL, 0); + ret = err_merge(ret, err); } err_rate = (ist->frames_decoded || ist->decode_errors) ? |