breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure: consider using /usr/include/openjpeg-1.5 when searching for openjpeg

Browse Source 
Beginning with version 1.5.1 openjpeg defaults to install its headers to
/usr/include/openjpeg-${major}.${minor} instead of /usr/include without
providing a compatibility symlink making the old test fail.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Johannes Nixdorf
2012-12-16 16:02:08 +01:00
committed by Michael Niedermayer
parent 985aa0be82
commit e749b5dd98
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/libopenjpegdec.c
View File

@@ -25,7 +25,6 @@
*/
#define OPJ_STATIC
#include <openjpeg.h>
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
@@ -35,6 +34,12 @@
#include "avcodec.h"
#include "thread.h"
#if HAVE_OPENJPEG_1_5_OPENJPEG_H
# include <openjpeg-1.5/openjpeg.h>
#else
# include <openjpeg.h>
#endif
#define JP2_SIG_TYPE 0x6A502020
#define JP2_SIG_VALUE 0x0D0A870A

7
libavcodec/libopenjpegenc.c
View File

@@ -25,7 +25,6 @@
*/
#define OPJ_STATIC
#include <openjpeg.h>
#include "libavutil/avassert.h"
#include "libavutil/common.h"
@@ -35,6 +34,12 @@
#include "avcodec.h"
#include "internal.h"
#if HAVE_OPENJPEG_1_5_OPENJPEG_H
# include <openjpeg-1.5/openjpeg.h>
#else
# include <openjpeg.h>
#endif
typedef struct {
AVClass *avclass;
opj_image_t *image;