summaryrefslogtreecommitdiff
path: root/recipes-support/opencv/opencv/0003-cap_ffmpeg-wrap-a-forgotten-instance-of-CODEC_ID_H26.patch
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-01-07 19:21:07 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2020-06-09 16:50:40 +0200
commitc73893a3377ebb557b0fb41f75b26dff40da4442 (patch)
treed41a25f36d156354e69c0273490d719f5449e94b /recipes-support/opencv/opencv/0003-cap_ffmpeg-wrap-a-forgotten-instance-of-CODEC_ID_H26.patch
parentdabc75f797a1c54c4a9ceb12efd2b41a410b098b (diff)
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit d6d84e0cc4cd661d2c7fc1f8c6f4e65f7cea43ef)
Diffstat (limited to 'recipes-support/opencv/opencv/0003-cap_ffmpeg-wrap-a-forgotten-instance-of-CODEC_ID_H26.patch')
-rw-r--r--recipes-support/opencv/opencv/0003-cap_ffmpeg-wrap-a-forgotten-instance-of-CODEC_ID_H26.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/recipes-support/opencv/opencv/0003-cap_ffmpeg-wrap-a-forgotten-instance-of-CODEC_ID_H26.patch b/recipes-support/opencv/opencv/0003-cap_ffmpeg-wrap-a-forgotten-instance-of-CODEC_ID_H26.patch
deleted file mode 100644
index a0b9d19..0000000
--- a/recipes-support/opencv/opencv/0003-cap_ffmpeg-wrap-a-forgotten-instance-of-CODEC_ID_H26.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cb16656555e6c66fc5aae304f46b9b472bac50aa Mon Sep 17 00:00:00 2001
-From: Anton Khirnov <anton@khirnov.net>
-Date: Thu, 6 Feb 2014 09:45:54 +0100
-Subject: [PATCH 3/5] cap_ffmpeg: wrap a forgotten instance of CODEC_ID_H264 in
- CV_CODEC()
-
-(cherry picked from commit 614c66d402e260ff4c8ae7eb132d1c498febdeb2)
----
- modules/highgui/src/cap_ffmpeg_impl.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp
-index 068642a..e2e3c30 100644
---- a/modules/highgui/src/cap_ffmpeg_impl.hpp
-+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
-@@ -1119,7 +1119,7 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc,
- and qmin since they will be set to reasonable defaults by the libx264
- preset system. Also, use a crf encode with the default quality rating,
- this seems easier than finding an appropriate default bitrate. */
-- if (c->codec_id == CODEC_ID_H264) {
-+ if (c->codec_id == CV_CODEC(CODEC_ID_H264)) {
- c->gop_size = -1;
- c->qmin = -1;
- c->bit_rate = 0;
---
-1.9.3
-