Attachment #448214 for bug #595318

View | Details | Raw Unified | Return to bug 595318
Collapse All | Expand All

Lines 5669-5675 enabled libopencv && { check_hea Link Here

(-)ffmpeg-3.1.1/configure (-1 / +1 lines)
5669	require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } \|\|	5669	require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } \|\|
5670	require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }	5670	require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
5671	enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion	5671	enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
5672	enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC \|\|	5672	enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 \|\|
5673	check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC \|\|	5673	check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC \|\|
5674	check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC \|\|	5674	check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC \|\|
5675	check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC \|\|	5675	check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC \|\|

Lines 24-31 Link Here

(-)ffmpeg-3.1.1/libavcodec/libopenjpegdec.c (-2 lines)
24	* JPEG 2000 decoder using libopenjpeg	24	* JPEG 2000 decoder using libopenjpeg
25	*/	25	*/
26	#define OPJ_STATIC
27
28	#include "libavutil/common.h"	26	#include "libavutil/common.h"
29	#include "libavutil/imgutils.h"	27	#include "libavutil/imgutils.h"
30	#include "libavutil/intreadwrite.h"	28	#include "libavutil/intreadwrite.h"

Lines 24-31 Link Here

(-)ffmpeg-3.1.1/libavcodec/libopenjpegenc.c (-2 lines)
24	* JPEG 2000 encoder using libopenjpeg	24	* JPEG 2000 encoder using libopenjpeg
25	*/	25	*/
26	#define OPJ_STATIC
27
28	#include "libavutil/avassert.h"	26	#include "libavutil/avassert.h"
29	#include "libavutil/common.h"	27	#include "libavutil/common.h"
30	#include "libavutil/imgutils.h"	28	#include "libavutil/imgutils.h"

Return to bug 595318