OSSForks/opencv
1
0
Fork 0
mirror of https://github.com/zebrajr/opencv.git synced 2025-12-06 12:19:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27948 from vrabaud:c_headers

Browse Source 
Get code to compile without FFmpeg's libavdevice
This commit is contained in:
Alexander Smorkalov 2025-10-30 16:10:13 +03:00 committed by GitHub
commit c69e20a495
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/videoio/src/cap_ffmpeg_impl.hpp
View File

@ -1170,7 +1170,9 @@ bool CvCapture_FFMPEG::open(const char* _filename, int index, const Ptr<IStreamR
input_format = av_find_input_format(entry->value); input_format = av_find_input_format(entry->value);
} }
#ifdef HAVE_FFMPEG_LIBAVDEVICE
AVDeviceInfoList* device_list = nullptr; AVDeviceInfoList* device_list = nullptr;
#endif
if (index >= 0) if (index >= 0)
{ {
#ifdef HAVE_FFMPEG_LIBAVDEVICE #ifdef HAVE_FFMPEG_LIBAVDEVICE
@ -1267,13 +1269,13 @@ bool CvCapture_FFMPEG::open(const char* _filename, int index, const Ptr<IStreamR
ic->pb = avio_context; ic->pb = avio_context;
} }
int err = avformat_open_input(&ic, _filename, input_format, &dict); int err = avformat_open_input(&ic, _filename, input_format, &dict);
#ifdef HAVE_FFMPEG_LIBAVDEVICE
if (device_list) if (device_list)
{ {
#ifdef HAVE_FFMPEG_LIBAVDEVICE
avdevice_free_list_devices(&device_list); avdevice_free_list_devices(&device_list);
device_list = nullptr; device_list = nullptr;
#endif
} }
#endif
if (err < 0) if (err < 0)
{ {