summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <[email protected]>2024-03-21 13:32:29 +0100
committerAndreas Rheinhardt <[email protected]>2024-03-24 19:02:41 +0100
commitccd2b7f858d2b1d10a49629aa9b24055b7cc5646 (patch)
treef00dcad82dbccf5cd0da30942fc2ae68d9c67cae
parent07064f9bdac3f865e039373544d53cf633aecfa6 (diff)
avformat/demux: Combine "Packet corrupt" logmessages
Otherwise these statements might be torn apart by av_logs from other threads. Signed-off-by: Andreas Rheinhardt <[email protected]>
-rw-r--r--libavformat/demux.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/demux.c b/libavformat/demux.c
index 4345ed4c8c..e50d1a9cfe 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -572,14 +572,13 @@ static int handle_new_packet(AVFormatContext *s, AVPacket *pkt, int allow_passth
if (pkt->flags & AV_PKT_FLAG_CORRUPT) {
av_log(s, AV_LOG_WARNING,
- "Packet corrupt (stream = %d, dts = %s)",
- pkt->stream_index, av_ts2str(pkt->dts));
+ "Packet corrupt (stream = %d, dts = %s)%s.\n",
+ pkt->stream_index, av_ts2str(pkt->dts),
+ s->flags & AVFMT_FLAG_DISCARD_CORRUPT ? ", dropping it" : "");
if (s->flags & AVFMT_FLAG_DISCARD_CORRUPT) {
- av_log(s, AV_LOG_WARNING, ", dropping it.\n");
av_packet_unref(pkt);
return 1;
}
- av_log(s, AV_LOG_WARNING, ".\n");
}
st = s->streams[pkt->stream_index];