From c0c0a5f106c3a3ab80ab53b57db2132e585e80a0 Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Sat, 22 Oct 2022 05:38:34 +0000 Subject: [PATCH] fftools/ffmpeg_demux: set default hwaccel_output_format for mediacodec Signed-off-by: Zhao Zhili --- fftools/ffmpeg_demux.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 76778d774d..d2a6d39703 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -625,6 +625,10 @@ static void add_input_streams(const OptionsContext *o, AVFormatContext *ic) "with old commandlines. This behaviour is DEPRECATED and will be removed " "in the future. Please explicitly set \"-hwaccel_output_format qsv\".\n"); ist->hwaccel_output_format = AV_PIX_FMT_QSV; + } else if (!hwaccel_output_format && hwaccel && !strcmp(hwaccel, "mediacodec")) { + // There is no real AVHWFrameContext implementation. Set + // hwaccel_output_format to avoid av_hwframe_transfer_data error. + ist->hwaccel_output_format = AV_PIX_FMT_MEDIACODEC; } else if (hwaccel_output_format) { ist->hwaccel_output_format = av_get_pix_fmt(hwaccel_output_format); if (ist->hwaccel_output_format == AV_PIX_FMT_NONE) {