Advertisement
Guest User

Untitled

a guest
Mar 22nd, 2012
71
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.70 KB | None | 0 0
  1. diff --git a/configure b/configure
  2. index c6a4d17..9954c36 100755
  3. --- a/configure
  4. +++ b/configure
  5. @@ -3168,7 +3168,7 @@ enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
  6. enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
  7. enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
  8. enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
  9. -enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
  10. +enabled libopenjpeg && require libopenjpeg openjpeg-1.5/openjpeg.h opj_version -lopenjpeg
  11. enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
  12. enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
  13. enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
  14. diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
  15. index 89bfb34..2daf50e 100644
  16. --- a/libavcodec/libopenjpegdec.c
  17. +++ b/libavcodec/libopenjpegdec.c
  18. @@ -30,7 +30,7 @@
  19. #include "libavutil/intreadwrite.h"
  20. #include "thread.h"
  21. #define OPJ_STATIC
  22. -#include <openjpeg.h>
  23. +#include <openjpeg-1.5/openjpeg.h>
  24.  
  25. #define JP2_SIG_TYPE 0x6A502020
  26. #define JP2_SIG_VALUE 0x0D0A870A
  27. diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
  28. index 30cc022..dc475a9 100644
  29. --- a/libavcodec/libopenjpegenc.c
  30. +++ b/libavcodec/libopenjpegenc.c
  31. @@ -29,7 +29,7 @@
  32. #include "avcodec.h"
  33. #include "libavutil/intreadwrite.h"
  34. #define OPJ_STATIC
  35. -#include <openjpeg.h>
  36. +#include <openjpeg-1.5/openjpeg.h>
  37.  
  38. typedef struct {
  39. opj_image_t *image;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement