diff options
| author | Sven Gothel <[email protected]> | 2015-02-05 16:27:56 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-02-05 16:27:56 +0100 |
| commit | 1eea4278f1be5900f0d990d0a7d352923def217c (patch) | |
| tree | 208f53396ecf31c3e6f45fcda837e67a8d306167 /make/build-jogl.xml | |
| parent | 8426f47419bf116b427461a36534e70c48ed930d (diff) | |
FFMPEGMediaPlayer: Add support for libav-11 and ffmpeg 2.[4-x] (Latest release, used in Debian 8, etc)
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 3814d172a..119bb9d3d 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1528,6 +1528,7 @@ <include name="${rootrel.obj.joglsub}/ffmpeg_lavc53_lavf53_lavu51.*"/> <include name="${rootrel.obj.joglsub}/ffmpeg_lavc54_lavf54_lavu52_lavr01.*"/> <include name="${rootrel.obj.joglsub}/ffmpeg_lavc55_lavf55_lavu53_lavr01.*"/> + <include name="${rootrel.obj.joglsub}/ffmpeg_lavc56_lavf56_lavu54_lavr02.*"/> </patternset> <patternset id="c.src.files.jogl.desktop"> @@ -1668,7 +1669,7 @@ <target name="c.build.jogl.prepare"> <javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="jogamp.opengl.GLDebugMessageHandler, jogamp.opengl.GLContextImpl" /> - <javah destdir="${src.generated.c.libav}" classpath="${javah.classpath}" class="jogamp.opengl.util.av.impl.FFMPEGStaticNatives,jogamp.opengl.util.av.impl.FFMPEGv08Natives,jogamp.opengl.util.av.impl.FFMPEGv09Natives,jogamp.opengl.util.av.impl.FFMPEGv10Natives" /> + <javah destdir="${src.generated.c.libav}" classpath="${javah.classpath}" class="jogamp.opengl.util.av.impl.FFMPEGStaticNatives,jogamp.opengl.util.av.impl.FFMPEGv08Natives,jogamp.opengl.util.av.impl.FFMPEGv09Natives,jogamp.opengl.util.av.impl.FFMPEGv10Natives,jogamp.opengl.util.av.impl.FFMPEGv11Natives" /> <javah destdir="${src.generated.c.openmax}" classpath="${javah.classpath}" class="jogamp.opengl.util.av.impl.OMXGLMediaPlayer" /> <!-- Generate the waveout Mixer header --> <!-- FIXME: this is temporary until we move this to another workspace --> @@ -1688,6 +1689,11 @@ output.lib.name="jogl_ffmpegv10" compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="${linker.cfg.id.os}"/> + + <c.build.ffmpeg version.lav="lavc56_lavf56_lavu54_lavr02" + output.lib.name="jogl_ffmpegv11" + compiler.cfg.id="${compiler.cfg.id}" + linker.cfg.id="${linker.cfg.id.os}"/> </target> <target name="c.build.jogl.desktop" unless="setup.noNativeDesktop"> |