1 files changed, 0 insertions, 112 deletions
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-Merge-pull-request-10011-from-jviney-master.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-Merge-pull-request-10011-from-jviney-master.patch
deleted file mode 100644
index b20183b3..00000000
--- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-Merge-pull-request-10011-from-jviney-master.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From b1d208891b9f6ae3968730b120a5d0dcbba679d0 Mon Sep 17 00:00:00 2001
-From: Jonathan Viney <jonathan.viney@gmail.com>
-Date: Sun, 19 Nov 2017 07:08:41 +1300
-Subject: [PATCH] Merge pull request #10011 from jviney:master
-
-Fix build with FFmpeg master. Some deprecated APIs have been removed. (#10011)
-
-* Fix build with FFmpeg master.
-
-* ffmpeg: update AVFMT_RAWPICTURE support removal
----
- modules/videoio/src/cap_ffmpeg_impl.hpp | 37 +++++++++++++++++++++++++--------
- 1 file changed, 28 insertions(+), 9 deletions(-)
-
-diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp
-index 5f51e65..4646148 100644
---- a/modules/videoio/src/cap_ffmpeg_impl.hpp
-+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
-@@ -149,6 +149,10 @@ extern "C" {
- #define AV_PIX_FMT_GRAY16BE PIX_FMT_GRAY16BE
- #endif
- 
-+#ifndef PKT_FLAG_KEY
-+#define PKT_FLAG_KEY AV_PKT_FLAG_KEY
-+#endif
-+
- #if LIBAVUTIL_BUILD >= (LIBAVUTIL_VERSION_MICRO >= 100 \
-     ? CALC_FFMPEG_VERSION(52, 38, 100) : CALC_FFMPEG_VERSION(52, 13, 0))
- #define USE_AV_FRAME_GET_BUFFER 1
-@@ -1570,7 +1574,11 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc,
-     // some formats want stream headers to be seperate
-     if(oc->oformat->flags & AVFMT_GLOBALHEADER)
-     {
-+#if LIBAVCODEC_BUILD > CALC_FFMPEG_VERSION(56, 35, 0)
-+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
-         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
-     }
- #endif
- 
-@@ -1598,23 +1606,24 @@ static int icv_av_write_frame_FFMPEG( AVFormatContext * oc, AVStream * video_st,
- #endif
-     int ret = OPENCV_NO_FRAMES_WRITTEN_CODE;
- 
--    if (oc->oformat->flags & AVFMT_RAWPICTURE) {
-+#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(57, 0, 0)
-+    if (oc->oformat->flags & AVFMT_RAWPICTURE)
-+    {
-         /* raw video case. The API will change slightly in the near
-            futur for that */
-         AVPacket pkt;
-         av_init_packet(&pkt);
- 
--#ifndef PKT_FLAG_KEY
--#define PKT_FLAG_KEY AV_PKT_FLAG_KEY
--#endif
--
-         pkt.flags |= PKT_FLAG_KEY;
-         pkt.stream_index= video_st->index;
-         pkt.data= (uint8_t *)picture;
-         pkt.size= sizeof(AVPicture);
- 
-         ret = av_write_frame(oc, &pkt);
--    } else {
-+    }
-+    else
-+#endif
-+    {
-         /* encode the image */
-         AVPacket pkt;
-         av_init_packet(&pkt);
-@@ -1772,7 +1781,9 @@ void CvVideoWriter_FFMPEG::close()
-     /* write the trailer, if any */
-     if(ok && oc)
-     {
--        if( (oc->oformat->flags & AVFMT_RAWPICTURE) == 0 )
-+#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(57, 0, 0)
-+        if (!(oc->oformat->flags & AVFMT_RAWPICTURE))
-+#endif
-         {
-             for(;;)
-             {
-@@ -2071,7 +2082,11 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
- 
-     outbuf = NULL;
- 
--    if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) {
-+
-+#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(57, 0, 0)
-+    if (!(oc->oformat->flags & AVFMT_RAWPICTURE))
-+#endif
-+    {
-         /* allocate output buffer */
-         /* assume we will never get codec output with more than 4 bytes per pixel... */
-         outbuf_size = width*height*4;
-@@ -2376,7 +2391,11 @@ AVStream* OutputMediaStream_FFMPEG::addVideoStream(AVFormatContext *oc, CV_CODEC
-         // some formats want stream headers to be seperate
-         if (oc->oformat->flags & AVFMT_GLOBALHEADER)
-         {
--            c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+            #if LIBAVCODEC_BUILD > CALC_FFMPEG_VERSION(56, 35, 0)
-+                c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+            #else
-+                c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+            #endif
-         }
-     #endif
- 
--- 
-2.7.4
-