diff options
Diffstat (limited to 'src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp')
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp index f207d11f0..fe51aa877 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp @@ -30,7 +30,9 @@ static Q_LOGGING_CATEGORY(qLHWAccel, "qt.multimedia.ffmpeg.hwaccel"); namespace QFFmpeg { static const std::initializer_list<AVHWDeviceType> preferredHardwareAccelerators = { -#if defined(Q_OS_LINUX) +#if defined(Q_OS_ANDROID) + AV_HWDEVICE_TYPE_MEDIACODEC, +#elif defined(Q_OS_LINUX) AV_HWDEVICE_TYPE_VAAPI, AV_HWDEVICE_TYPE_VDPAU, AV_HWDEVICE_TYPE_CUDA, @@ -38,8 +40,6 @@ static const std::initializer_list<AVHWDeviceType> preferredHardwareAccelerators AV_HWDEVICE_TYPE_D3D11VA, #elif defined (Q_OS_DARWIN) AV_HWDEVICE_TYPE_VIDEOTOOLBOX, -#elif defined (Q_OS_ANDROID) - AV_HWDEVICE_TYPE_MEDIACODEC, #endif }; |