Domovská stránka Prehľadávať Pomoc
Registrovať Prihlásiť sa
PUBLIC_REPOS
/
buildroot
zrkadlo git://git.buildroot.net/buildroot
2
1
Fork 0
Súbory
Strom: 33de45c067
Branche Tagy
buildroot
/
package
/
opencv4
/
0001-modules-videoio-src-cap_ffmpeg_impl.hpp-fix-build-wi.patch

0001-modules-videoio-src-cap_ffmpeg_impl.hpp-fix-build-wi.patch 3.4 KB
História Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 
  1. From 4c92a2869b9a8f736a12ba859b74e5cadce62387 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
    3. 

  3. Date: Fri, 12 Nov 2021 09:50:17 +0100
    4. 

  4. Subject: [PATCH] modules/videoio/src/cap_ffmpeg_impl.hpp: fix build with gcc
    5. 

  5.  4.8
    6. 

  6. 

  7. Fix the following build failure with gcc 4.8:
    8. 

  8. 

  9. In file included from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/cap_ffmpeg_impl.hpp:100:0,
    10. 

  10.                  from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/cap_ffmpeg.cpp:50:
    11. 

  11. /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/cap_ffmpeg_hw.hpp: In constructor 'HWAccelIterator::HWAccelIterator(cv::VideoAccelerationType, bool, AVDictionary*)':
    12. 

  12. /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/cap_ffmpeg_hw.hpp:939:23: error: use of deleted function 'std::basic_istringstream<char>& std::basic_istringstream<char>::operator=(const std::basic_istringstream<char>&)'
    13. 

  13.              s_stream_ = std::istringstream(accel_list);
    14. 

  14.                        ^
    15. 

  15. In file included from /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/arm-none-linux-gnueabi/include/c++/4.8.3/complex:45:0,
    16. 

  16.                  from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/core/include/opencv2/core/cvstd.inl.hpp:47,
    17. 

  17.                  from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/core/include/opencv2/core.hpp:3306,
    18. 

  18.                  from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/include/opencv2/videoio.hpp:46,
    19. 

  19.                  from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/precomp.hpp:57,
    20. 

  20.                  from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/cap_ffmpeg.cpp:42:
    21. 

  21. /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/arm-none-linux-gnueabi/include/c++/4.8.3/sstream:272:11: note: 'std::basic_istringstream<char>& std::basic_istringstream<char>::operator=(const std::basic_istringstream<char>&)' is implicitly deleted because the default definition would be ill-formed:
    22. 

  22.      class basic_istringstream : public basic_istream<_CharT, _Traits>
    23. 

  23.            ^
    24. 

  24. /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/arm-none-linux-gnueabi/include/c++/4.8.3/sstream:272:11: error: use of deleted function 'std::basic_istream<char>& std::basic_istream<char>::operator=(const std::basic_istream<char>&)'
    25. 

  25. 

  26. Fixes:
    27. 

  27.  - http://autobuild.buildroot.org/results/60f8846b435dafda0ced412d59ffe15bdff0810d
    28. 

  28. 

  29. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
    30. 

  30. [Retrieved from:
    31. 

  31. https://github.com/opencv/opencv/commit/4c92a2869b9a8f736a12ba859b74e5cadce62387]
    32. 

  32. ---
    33. 

  33.  modules/videoio/src/cap_ffmpeg_impl.hpp | 6 ++++++
    34. 

  34.  1 file changed, 6 insertions(+)
    35. 

  35. 

  36. diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp
    37. 

  37. index d393b73ff4a2..76e1b855b7c8 100644
    38. 

  38. --- a/modules/videoio/src/cap_ffmpeg_impl.hpp
    39. 

  39. +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
    40. 

  40. @@ -93,6 +93,12 @@ extern "C" {
    41. 

  41.  }
    42. 

  42.  #endif
    43. 

  43.  
    44. 

  44. +// GCC 4.x compilation bug. Details: https://github.com/opencv/opencv/issues/20292
    45. 

  45. +#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)
    46. 

  46. +#undef USE_AV_HW_CODECS
    47. 

  47. +#define USE_AV_HW_CODECS 0
    48. 

  48. +#endif
    49. 

  49. +
    50. 

  50.  //#define USE_AV_HW_CODECS 0
    51. 

  51.  #ifndef USE_AV_HW_CODECS
    52. 

  52.  #if LIBAVUTIL_VERSION_MAJOR >= 56 // FFMPEG 4.0+
    53.