virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

fftools: fix hwaccels option dump redundancy

Browse Source 
When QSV is enabled in FFmpeg, the command "ffmpeg -hwaccels" shows a
duplicate entry in acceleration methods for QSV:

Hardware acceleration methods:
vaapi
qsv
drm
opencl
qsv

Reviewed-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
This commit is contained in:
Jun Zhao
2020-04-09 21:54:01 +08:00
parent f0d712d0f9
commit 5633f9a8a2
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fftools/ffmpeg_opt.c
View File

@@ -233,14 +233,11 @@ static void init_options(OptionsContext *o)
static int show_hwaccels(void *optctx, const char *opt, const char *arg) static int show_hwaccels(void *optctx, const char *opt, const char *arg)
{ {
enum AVHWDeviceType type = AV_HWDEVICE_TYPE_NONE; enum AVHWDeviceType type = AV_HWDEVICE_TYPE_NONE;
int i;
printf("Hardware acceleration methods:\n"); printf("Hardware acceleration methods:\n");
while ((type = av_hwdevice_iterate_types(type)) != while ((type = av_hwdevice_iterate_types(type)) !=
AV_HWDEVICE_TYPE_NONE) AV_HWDEVICE_TYPE_NONE)
printf("%s\n", av_hwdevice_get_type_name(type)); printf("%s\n", av_hwdevice_get_type_name(type));
for (i = 0; hwaccels[i].name; i++)
printf("%s\n", hwaccels[i].name);
printf("\n"); printf("\n");
return 0; return 0;
} }
@@ -936,8 +933,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
AV_HWDEVICE_TYPE_NONE) AV_HWDEVICE_TYPE_NONE)
av_log(NULL, AV_LOG_FATAL, "%s ", av_log(NULL, AV_LOG_FATAL, "%s ",
av_hwdevice_get_type_name(type)); av_hwdevice_get_type_name(type));
for (i = 0; hwaccels[i].name; i++)
av_log(NULL, AV_LOG_FATAL, "%s ", hwaccels[i].name);
av_log(NULL, AV_LOG_FATAL, "\n"); av_log(NULL, AV_LOG_FATAL, "\n");
exit_program(1); exit_program(1);
} }