Message ID | AM7PR03MB66609B746351A83F826910B58F389@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Accepted |
Commit | 047a4e580ecbe4542a9ad090af630d4e045df21e |
Headers | show |
Series | [FFmpeg-devel,1/2] fftools/ffprobe: Flush decoder after draining | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_aarch64_jetson | success | Make finished |
andriy/make_fate_aarch64_jetson | success | Make fate finished |
andriy/make_armv7_RPi4 | success | Make finished |
andriy/make_fate_armv7_RPi4 | success | Make fate finished |
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 4205ddedda..38b7e7e00f 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2561,7 +2561,7 @@ static av_always_inline int process_frame(WriterContext *w, int ret = 0, got_frame = 0; clear_log(1); - if (dec_ctx && dec_ctx->codec) { + if (dec_ctx) { switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_AUDIO: @@ -2901,7 +2901,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id break; } - if (dec_ctx && dec_ctx->codec && dec_ctx->codec->priv_class && show_private_data) { + if (dec_ctx && dec_ctx->codec->priv_class && show_private_data) { const AVOption *opt = NULL; while (opt = av_opt_next(dec_ctx->priv_data,opt)) { uint8_t *str;
A decoder is only opened if there is a decoder for the codec, so every AVCodecContext here has AVCodecContext.codec set. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- fftools/ffprobe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)