Skip to content

V
vlc-2-2
Commit 92b7c621 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contribs: use openjpeg in libav/ffmpeg 

So that we have jp2k support on Windows and MacOS
parent 96d4c7f7
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
NEWS
View file @ 92b7c621
...@@ -66,6 +66,7 @@ Codecs: ...@@ -66,6 +66,7 @@ Codecs:
The Schroedinger module should be prefered to the Dirac one The Schroedinger module should be prefered to the Dirac one
* Support for WMV Images, aka WMVP and WVP2, as used by Photo Story * Support for WMV Images, aka WMVP and WVP2, as used by Photo Story
* EIA-608 closed captions improvements * EIA-608 closed captions improvements
* Support for JPEG 2000 and Motion JPEG 2000 in the Windows and Mac binaries
Demuxers: Demuxers:
* New images demuxer supporting jpeg, png, targa, xcf, git, tiff, bmp, pcx, lbm * New images demuxer supporting jpeg, png, targa, xcf, git, tiff, bmp, pcx, lbm
......
contrib/src/ffmpeg/rules.mak
View file @ 92b7c621
...@@ -11,6 +11,7 @@ FFMPEGCONF = \ ...@@ -11,6 +11,7 @@ FFMPEGCONF = \
--disable-decoder=libvpx \ --disable-decoder=libvpx \
--enable-libgsm \ --enable-libgsm \
--enable-libvpx \ --enable-libvpx \
--enable-libopenjpeg \
--disable-debug \ --disable-debug \
--enable-gpl \ --enable-gpl \
--enable-postproc \ --enable-postproc \
...@@ -22,7 +23,7 @@ FFMPEGCONF = \ ...@@ -22,7 +23,7 @@ FFMPEGCONF = \
--disable-protocols \ --disable-protocols \
--disable-avfilter \ --disable-avfilter \
--disable-network --disable-network
DEPS_ffmpeg = zlib gsm vpx $(DEPS_vpx) DEPS_ffmpeg = zlib gsm vpx $(DEPS_vpx) openjpeg
# Optional dependencies # Optional dependencies
ifdef BUILD_ENCODERS ifdef BUILD_ENCODERS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment