diff options
| author | Anton Khirnov <anton@khirnov.net> | 2023-05-07 18:29:09 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2023-05-15 13:32:01 +0200 |
| commit | a1002bc39c46df5d468666e6bd9f490b023d3ca2 (patch) | |
| tree | cc986a44f02961516b7b28181803c86d97216071 | |
| parent | fd980b261536fbd30f2c8df42779ecb09bf1b240 (diff) | |
| download | ffmpeg-a1002bc39c46df5d468666e6bd9f490b023d3ca2.tar.gz | |
fftools/ffmpeg: replace print_error() by more meaningful messages
| -rw-r--r-- | fftools/ffmpeg.c | 5 | ||||
| -rw-r--r-- | fftools/ffmpeg_demux.c | 3 | ||||
| -rw-r--r-- | fftools/ffmpeg_mux.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 725ffca631..981714d027 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1756,12 +1756,10 @@ static void decode_flush(InputFile *ifile) static int process_input(int file_index) { InputFile *ifile = input_files[file_index]; - AVFormatContext *is; InputStream *ist; AVPacket *pkt; int ret, i; - is = ifile->ctx; ret = ifile_get_packet(ifile, &pkt); if (ret == AVERROR(EAGAIN)) { @@ -1775,7 +1773,8 @@ static int process_input(int file_index) } if (ret < 0) { if (ret != AVERROR_EOF) { - print_error(is->url, ret); + av_log(ifile, AV_LOG_ERROR, + "Error retrieving a packet from demuxer: %s\n", av_err2str(ret)); if (exit_on_error) exit_program(1); } diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index f3a6597ddf..2822f0ab7f 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1405,7 +1405,8 @@ int ifile_open(const OptionsContext *o, const char *filename) /* open the input file with generic avformat function */ err = avformat_open_input(&ic, filename, file_iformat, &o->g->format_opts); if (err < 0) { - print_error(filename, err); + av_log(d, AV_LOG_ERROR, + "Error opening input: %s\n", av_err2str(err)); if (err == AVERROR_PROTOCOL_NOT_FOUND) av_log(d, AV_LOG_ERROR, "Did you mean file:%s?\n", filename); exit_program(1); diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index afcd4df99b..36ed482072 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -139,7 +139,9 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) ret = av_interleaved_write_frame(s, pkt); if (ret < 0) { - print_error("av_interleaved_write_frame()", ret); + av_log(ost, AV_LOG_ERROR, + "Error submitting a packet to the muxer: %s\n", + av_err2str(ret)); goto fail; } |