Ticket #5694: ffmpeg_opj2.patch

File ffmpeg_opj2.patch, 1.9 KB (added by Julian Sikorski, 10 years ago)

patch fixing build failure

  • ffmpeg-3.1. 

    diff -rupN ffmpeg-3.1.1/configure ffmpeg-3.1.1-new/configure
    old new enabled libopencv && { check_hea  
    56695669                                 require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
    56705670                               require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
    56715671enabled 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 ||
     5672enabled libopenjpeg       && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
    56735673                               check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
    56745674                               check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
    56755675                               check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||

  • libavcodec/libopenjpegdec.c 

    diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegdec.c ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c
    old new  
    2424 * JPEG 2000 decoder using libopenjpeg
    2525 */
    2626
    27 #define  OPJ_STATIC
    28 
    2927#include "libavutil/common.h"
    3028#include "libavutil/imgutils.h"
    3129#include "libavutil/intreadwrite.h"

  • libavcodec/libopenjpegenc.c 

    diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegenc.c ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c
    old new  
    2424 * JPEG 2000 encoder using libopenjpeg
    2525 */
    2626
    27 #define  OPJ_STATIC
    28 
    2927#include "libavutil/avassert.h"
    3028#include "libavutil/common.h"
    3129#include "libavutil/imgutils.h"