From 9c16310fe509bd81b355207160ce5afc5f645855 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 21 Mar 2022 17:12:25 +0100 Subject: fftools/ffmpeg: handle dumping input packets in input_thread() This is a more appropriate place for this. --- fftools/ffmpeg.c | 4 ---- fftools/ffmpeg_demux.c | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 6bae691cf4..9757883961 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3831,10 +3831,6 @@ static int process_input(int file_index) reset_eagain(); - if (do_pkt_dump) { - av_pkt_dump_log2(NULL, AV_LOG_INFO, pkt, do_hex_dump, - is->streams[pkt->stream_index]); - } /* the following test is needed in case new streams appear dynamically in stream : we ignore them */ if (pkt->stream_index >= ifile->nb_streams) { diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 2629af5950..f9bd6d47fe 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -45,6 +45,12 @@ static void *input_thread(void *arg) av_thread_message_queue_set_err_recv(f->in_thread_queue, ret); break; } + + if (do_pkt_dump) { + av_pkt_dump_log2(NULL, AV_LOG_INFO, pkt, do_hex_dump, + f->ctx->streams[pkt->stream_index]); + } + queue_pkt = av_packet_alloc(); if (!queue_pkt) { av_packet_unref(pkt); -- cgit v1.2.3