[vlc-commits] Contribs: use openjpeg in libav/ffmpeg

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Sep 15 13:17:52 2011 +0200| [92b7c62150ef1bbb3ab21c6d06f77d84299ce92f] | committer: Jean-Baptiste Kempf

Contribs: use openjpeg in libav/ffmpeg

So that we have jp2k support on Windows and MacOS

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=92b7c62150ef1bbb3ab21c6d06f77d84299ce92f
---

 NEWS                         |    1 +
 contrib/src/ffmpeg/rules.mak |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 5be2cb2..dc7a729 100644
--- a/NEWS
+++ b/NEWS
@@ -66,6 +66,7 @@ Codecs:
    The Schroedinger module should be prefered to the Dirac one
  * Support for WMV Images, aka WMVP and WVP2, as used by Photo Story
  * EIA-608 closed captions improvements
+ * Support for JPEG 2000 and Motion JPEG 2000 in the Windows and Mac binaries
 
 Demuxers:
  * New images demuxer supporting jpeg, png, targa, xcf, git, tiff, bmp, pcx, lbm
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index d3fbc8e..5b38c7c 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -11,6 +11,7 @@ FFMPEGCONF = \
 	--disable-decoder=libvpx \
 	--enable-libgsm \
 	--enable-libvpx \
+	--enable-libopenjpeg \
 	--disable-debug \
 	--enable-gpl \
 	--enable-postproc \
@@ -22,7 +23,7 @@ FFMPEGCONF = \
 	--disable-protocols \
 	--disable-avfilter \
 	--disable-network
-DEPS_ffmpeg = zlib gsm vpx $(DEPS_vpx)
+DEPS_ffmpeg = zlib gsm vpx $(DEPS_vpx) openjpeg
 
 # Optional dependencies
 ifdef BUILD_ENCODERS