From cb0f74ab9f533716e005b1c082dfd673fd018d3f Mon Sep 17 00:00:00 2001 From: Fernando Martin <20841945+f3rm4rf3r@users.noreply.github.com> Date: Thu, 4 Jun 2020 18:07:54 +0100 Subject: [PATCH] Merge pull request #17473 from f3rm4rf3r:fixingFourCCDocBrokenLink * - Fixing broken URL to mp4ra website * - Fixing broken URL to mp4ra website (in C videoio API) --- modules/videoio/include/opencv2/videoio.hpp | 2 +- modules/videoio/include/opencv2/videoio/videoio_c.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/videoio/include/opencv2/videoio.hpp b/modules/videoio/include/opencv2/videoio.hpp index 38a451b244..c1570ec5cb 100644 --- a/modules/videoio/include/opencv2/videoio.hpp +++ b/modules/videoio/include/opencv2/videoio.hpp @@ -873,7 +873,7 @@ public: VideoWriter::fourcc('P','I','M','1') is a MPEG-1 codec, VideoWriter::fourcc('M','J','P','G') is a motion-jpeg codec etc. List of codes can be obtained at [Video Codecs by FOURCC](http://www.fourcc.org/codecs.php) page. FFMPEG backend with MP4 container natively uses - other values as fourcc code: see [ObjectType](http://www.mp4ra.org/codecs.html), + other values as fourcc code: see [ObjectType](http://mp4ra.org/#/codecs), so you may receive a warning message from OpenCV about fourcc code conversion. @param fps Framerate of the created video stream. @param frameSize Size of the video frames. diff --git a/modules/videoio/include/opencv2/videoio/videoio_c.h b/modules/videoio/include/opencv2/videoio/videoio_c.h index 5167c77ace..ffbe2e358b 100644 --- a/modules/videoio/include/opencv2/videoio/videoio_c.h +++ b/modules/videoio/include/opencv2/videoio/videoio_c.h @@ -542,7 +542,7 @@ Simply call it with 4 chars fourcc code like `CV_FOURCC('I', 'Y', 'U', 'V')` List of codes can be obtained at [Video Codecs by FOURCC](http://www.fourcc.org/codecs.php) page. FFMPEG backend with MP4 container natively uses other values as fourcc code: -see [ObjectType](http://www.mp4ra.org/codecs.html). +see [ObjectType](http://mp4ra.org/#/codecs). */ CV_INLINE int CV_FOURCC(char c1, char c2, char c3, char c4) {