openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Typo, plus removed hack for my hardware

Browse Source
This commit is contained in:
eisneinechse
2018-12-08 15:54:29 -08:00
parent d07e851823
commit 70954f800c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/FFmpegReader.cpp
View File

@@ -400,7 +400,7 @@ void FFmpegReader::Open()
/* This is a hack:
my first card is AMD, my second card is nVidia
*/
switch (adapter_num) {
/* switch (adapter_num) {
case 1:
hw_de_av_device_type = AV_HWDEVICE_TYPE_CUDA;
pCodecCtx->get_format = get_hw_dec_format_cu;
@@ -409,7 +409,7 @@ void FFmpegReader::Open()
hw_de_av_device_type = AV_HWDEVICE_TYPE_VAAPI;
pCodecCtx->get_format = get_hw_dec_format_va;
break;
}
}*/
#elif defined(_WIN32)
adapter_ptr = NULL;
#elif defined(__APPLE__)
@@ -440,7 +440,7 @@ void FFmpegReader::Open()
if (av_hwdevice_ctx_create(&hw_device_ctx, hw_de_av_device_type, adapter_ptr, NULL, 0) >= 0) {
cerr << "\n\n**** HW device create OK ******** \n\n";
if (!(pCodecCtx->hw_device_ctx = av_buffer_ref(hw_device_ctx))) {
throw InvalidCodec("Hardware device reference create failed cuda.", path);
throw InvalidCodec("Hardware device reference create failed.", path);
}
}
else {