diff options
| author | Marton Balint <cus@passwd.hu> | 2018-10-09 23:03:20 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2018-10-14 23:52:41 +0200 |
| commit | f099946fafb8f4b1beb40b680599ccce96263ccd (patch) | |
| tree | 659b95f25156e7468dfa8c7f8726aaa1ccbfd885 /fftools | |
| parent | 19546cfef103bdc967b0e06ec35c96766e3febec (diff) | |
| download | ffmpeg-f099946fafb8f4b1beb40b680599ccce96263ccd.tar.gz | |
ffmpeg: log corrupted packets and frames
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/ffmpeg.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index aa495b5d9e..da4259a9a8 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2110,10 +2110,12 @@ static void check_decode_result(InputStream *ist, int *got_output, int ret) if (ret < 0 && exit_on_error) exit_program(1); - if (exit_on_error && *got_output && ist) { + if (*got_output && ist) { if (ist->decoded_frame->decode_error_flags || (ist->decoded_frame->flags & AV_FRAME_FLAG_CORRUPT)) { - av_log(NULL, AV_LOG_FATAL, "%s: corrupt decoded frame in stream %d\n", input_files[ist->file_index]->ctx->url, ist->st->index); - exit_program(1); + av_log(NULL, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, + "%s: corrupt decoded frame in stream %d\n", input_files[ist->file_index]->ctx->url, ist->st->index); + if (exit_on_error) + exit_program(1); } } } @@ -4350,9 +4352,11 @@ static int process_input(int file_index) if (ist->discard) goto discard_packet; - if (exit_on_error && (pkt.flags & AV_PKT_FLAG_CORRUPT)) { - av_log(NULL, AV_LOG_FATAL, "%s: corrupt input packet in stream %d\n", is->url, pkt.stream_index); - exit_program(1); + if (pkt.flags & AV_PKT_FLAG_CORRUPT) { + av_log(NULL, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, + "%s: corrupt input packet in stream %d\n", is->url, pkt.stream_index); + if (exit_on_error) + exit_program(1); } if (debug_ts) { |