Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 633576
Collapse All | Expand All

(-)a/configure (-1 / +4 lines)
Lines 1930-1935 HEADERS_LIST=" Link Here
1930 
    machine_ioctl_meteor_h
 1930 
    machine_ioctl_meteor_h
1931 
    malloc_h
 1931 
    malloc_h
1932 
    opencv2_core_core_c_h
 1932 
    opencv2_core_core_c_h
1933 
    openjpeg_2_3_openjpeg_h
1933 
    openjpeg_2_2_openjpeg_h
 1934 
    openjpeg_2_2_openjpeg_h
1934 
    openjpeg_2_1_openjpeg_h
 1935 
    openjpeg_2_1_openjpeg_h
1935 
    openjpeg_2_0_openjpeg_h
 1936 
    openjpeg_2_0_openjpeg_h
Lines 5950-5956 enabled libopencv && { check_header opencv2/core/core_c.h && Link Here
5950 
                                 require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
 5951 
                                 require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
5951 
                               require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
 5952 
                               require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
5952 
enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
 5953 
enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
5953 
enabled libopenjpeg       && { { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
 5954 
enabled libopenjpeg       && { { check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
5955 
                               check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
5956 
                               { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
5954 
                               check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
 5957 
                               check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
5955 
                               { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
 5958 
                               { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
5956 
                               check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
 5959 
                               check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
(-)a/libavcodec/libopenjpegdec.c (-3 / +5 lines)
Lines 34-40 Link Here
34 
#include "internal.h"
 34 
#include "internal.h"
35 
#include "thread.h"
 35 
#include "thread.h"
36 

          36
          

        

          
            

              37
              
#if HAVE_OPENJPEG_2_2_OPENJPEG_H


              37
              
#if HAVE_OPENJPEG_2_3_OPENJPEG_H

            

            

              
              

              38
              
#  include <openjpeg-2.3/openjpeg.h>

            

            


              39
              
#elif HAVE_OPENJPEG_2_2_OPENJPEG_H

            

        

          38
          
#  include <openjpeg-2.2/openjpeg.h>

          40
          
#  include <openjpeg-2.2/openjpeg.h>

        

        

          39
          
#elif HAVE_OPENJPEG_2_1_OPENJPEG_H

          41
          
#elif HAVE_OPENJPEG_2_1_OPENJPEG_H

        

        

          40
          
#  include <openjpeg-2.1/openjpeg.h>

          42
          
#  include <openjpeg-2.1/openjpeg.h>

        

  

    
      
            Lines 46-52
          
      
      
        Link Here
      
    
  

        

          46
          
#  include <openjpeg.h>

          48
          
#  include <openjpeg.h>

        

        

          47
          
#endif

          49
          
#endif

        

        

          48
          

          50
          

        

          
            

              49
              
#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H


              51
              
#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H

            

        

          50
          
#  define OPENJPEG_MAJOR_VERSION 2

          52
          
#  define OPENJPEG_MAJOR_VERSION 2

        

        

          51
          
#  define OPJ(x) OPJ_##x

          53
          
#  define OPJ(x) OPJ_##x

        

        

          52
          
#else

          54
          
#else

        

  

    
      
            Lines 431-437
          static int libopenjpeg_decode_frame(AVCodecContext *avctx,
      
      
        Link Here
      
    
  

        

          431
          
    opj_stream_set_read_function(stream, stream_read);

          433
          
    opj_stream_set_read_function(stream, stream_read);

        

        

          432
          
    opj_stream_set_skip_function(stream, stream_skip);

          434
          
    opj_stream_set_skip_function(stream, stream_skip);

        

        

          433
          
    opj_stream_set_seek_function(stream, stream_seek);

          435
          
    opj_stream_set_seek_function(stream, stream_seek);

        

          
            

              434
              
#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H


              436
              
#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H

            

        

          435
          
    opj_stream_set_user_data(stream, &reader, NULL);

          437
          
    opj_stream_set_user_data(stream, &reader, NULL);

        

        

          436
          
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H

          438
          
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H

        

        

          437
          
    opj_stream_set_user_data(stream, &reader);

          439
          
    opj_stream_set_user_data(stream, &reader);

        



(-)a/libavcodec/libopenjpegenc.c
      (-5 / +6 lines)




  

    
      
            Lines 32-38
          
      
      
        Link Here
      
    
  

        

          32
          
#include "avcodec.h"

          32
          
#include "avcodec.h"

        

        

          33
          
#include "internal.h"

          33
          
#include "internal.h"

        

        

          34
          

          34
          

        

          
            

              35
              
#if HAVE_OPENJPEG_2_2_OPENJPEG_H


              35
              
#if HAVE_OPENJPEG_2_3_OPENJPEG_H

            

            

              
              

              36
              
#  include <openjpeg-2.3/openjpeg.h>

            

            


              37
              
#elif HAVE_OPENJPEG_2_2_OPENJPEG_H

            

        

          36
          
#  include <openjpeg-2.2/openjpeg.h>

          38
          
#  include <openjpeg-2.2/openjpeg.h>

        

        

          37
          
#elif HAVE_OPENJPEG_2_1_OPENJPEG_H

          39
          
#elif HAVE_OPENJPEG_2_1_OPENJPEG_H

        

        

          38
          
#  include <openjpeg-2.1/openjpeg.h>

          40
          
#  include <openjpeg-2.1/openjpeg.h>

        

  

    
      
            Lines 44-50
          
      
      
        Link Here
      
    
  

        

          44
          
#  include <openjpeg.h>

          46
          
#  include <openjpeg.h>

        

        

          45
          
#endif

          47
          
#endif

        

        

          46
          

          48
          

        

          
            

              47
              
#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H


              49
              
#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H

            

        

          48
          
#  define OPENJPEG_MAJOR_VERSION 2

          50
          
#  define OPENJPEG_MAJOR_VERSION 2

        

        

          49
          
#  define OPJ(x) OPJ_##x

          51
          
#  define OPJ(x) OPJ_##x

        

        

          50
          
#else

          52
          
#else

        

  

    
      
            Lines 307-313
          static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
      
      
        Link Here
      
    
  

        

          307
          

          309
          

        

        

          308
          
    opj_set_default_encoder_parameters(&ctx->enc_params);

          310
          
    opj_set_default_encoder_parameters(&ctx->enc_params);

        

        

          309
          

          311
          

        

          
            

              310
              
#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H


              312
              
#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H

            

        

          311
          
    switch (ctx->cinema_mode) {

          313
          
    switch (ctx->cinema_mode) {

        

        

          312
          
    case OPJ_CINEMA2K_24:

          314
          
    case OPJ_CINEMA2K_24:

        

        

          313
          
        ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;

          315
          
        ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;

        

  

    
      
            Lines 771-777
          static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
      
      
        Link Here
      
    
  

        

          771
          
    opj_stream_set_write_function(stream, stream_write);

          773
          
    opj_stream_set_write_function(stream, stream_write);

        

        

          772
          
    opj_stream_set_skip_function(stream, stream_skip);

          774
          
    opj_stream_set_skip_function(stream, stream_skip);

        

        

          773
          
    opj_stream_set_seek_function(stream, stream_seek);

          775
          
    opj_stream_set_seek_function(stream, stream_seek);

        

          
            

              774
              
#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H


              776
              
#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H

            

        

          775
          
    opj_stream_set_user_data(stream, &writer, NULL);

          777
          
    opj_stream_set_user_data(stream, &writer, NULL);

        

        

          776
          
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H

          778
          
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H

        

        

          777
          
    opj_stream_set_user_data(stream, &writer);

          779
          
    opj_stream_set_user_data(stream, &writer);

        

            

              778
              
- 

              
              
            






  

  Return to bug 633576