Fix libav/ffmpeg compilation: Use 'dot less' dir/file names; Compile ffmpeg version dependent c-files individually and inject object files. ; ffmpeg *register_all() at setStream0(..)

- Use 'dot less' dir/file names

- Compile ffmpeg version dependent c-files individually and inject object files.

- ffmpeg *register_all() at setStream0(..)
  - Only register devices if available _and_ camera is requested.

114 files changed, 180 insertions, 92 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index 2061d55c9..e790ab42b 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -36,6 +36,7 @@
       -->
     <target name="set.debug">
         <property name="c.compiler.debug" value="true" /> 
+        <property name="c.compiler.optimise"  value="none" /> 
         <property name="javacdebug"       value="true" /> 
         <property name="javacdebuglevel"  value="source,lines,vars" /> 
     </target>
@@ -44,6 +45,9 @@
     <target name="common.init" depends="jogamp.env.init, gluegen.cpptasks.detect.os" unless="common.init.done">
         <property name="common.init.done" value="true" />
 
+        <property name="c.compiler.debug"     value="false" /> 
+        <property name="c.compiler.optimise"  value="none" /> 
+
         <!-- Set the project root directory to be up one directory. -->
         <property name="project.root"               value=".." />
         <property name="build"                      value="${project.root}/${rootrel.build}" />
@@ -216,6 +220,7 @@
         <property name="jogl.build.xml"             value="${jogl.make}/build-jogl.xml" />
         <property name="build.jogl"                 value="${build}/jogl" />
         <property name="obj.jogl"                   value="${build.jogl}/obj"/>
+        <property name="rootrel.obj.jogl"           value="${rootrel.build}/jogl/obj"/>
 
         <property name="newt.make"                  value="." />
         <property name="newt.build.xml"             value="${newt.make}/build-newt.xml" />
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index ee40c7e10..58ce64b6f 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -243,6 +243,7 @@
         <!-- The compiler output directories. -->
         <property name="classes"                    value="${build.jogl}/classes" />
         <property name="obj.joglsub"                value="${obj.jogl}/jogl" />
+        <property name="rootrel.obj.joglsub"        value="${rootrel.obj.jogl}/jogl"/>
         <property name="obj.cgsub"                  value="${obj.jogl}/cg" />
 
         <property name="javah.classpath" value="${gluegen-rt.jar}:${build.nativewindow}/classes:${classes}" />
@@ -1407,8 +1408,75 @@
         <move file="${src}" tofile="${dest}" />
     </target>
 
+    <!-- Only compile the ffmpeg version depending source files 
+         against their respective header files! 
+         We do not use the resulting static libraries directly,
+         but inject their obj-files in build.c for the jogl_* library! -->
+    <macrodef name="c.build.ffmpeg">
+      <attribute name="version.lav" />
+      <attribute name="compiler.cfg.id" />
+      <attribute name="linker.cfg.id" />
+      <attribute name="output.lib.name" />
+      <attribute name="c.compiler.use-jawt" default="false"/>
+      <sequential>
+        <echo message="Output lib name = @{output.lib.name}" />
+
+        <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
+
+        <patternset id="c.src.files.@{version.lav}">
+          <include name="${rootrel.src.c.libav}/ffmpeg_@{version.lav}.c"/>
+        </patternset>
+
+        <echo message="Compiling @{output.lib.name}" />
+
+      	<!-- have to wrap cc task with outofdate, because otherwise cc links a new library
+      	     even when no files have been compiled -->
+        <outofdate>
+          <sourcefiles>
+            <fileset dir="${project.root}"><patternset refid="c.src.files.@{version.lav}"/></fileset>
+            <fileset dir="${project.root}" includes="${rootrel.src.c.libav}/*"/>
+          </sourcefiles>
+          <targetfiles>
+            <fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.so"/>
+            <fileset dir="${obj.joglsub}" includes="@{output.lib.name}.dll"/>
+            <fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.jnilib"/>
+          </targetfiles>
+          <sequential>
+            <cc outtype="shared" 
+                objdir="${obj.joglsub}" 
+                outfile="${obj.joglsub}/@{output.lib.name}"
+                optimize="${c.compiler.optimise}" 
+                debug="${c.compiler.debug}"
+                multithreaded="true" 
+                exceptions="false" 
+                rtti="false">   
+      
+              <fileset dir="${project.root}"><patternset refid="c.src.files.@{version.lav}"/></fileset>
+      
+              <compiler extends="@{compiler.cfg.id}" >
+                <sysincludepath path="${java.includes.dir}"/>
+                <sysincludepath path="${java.includes.dir.platform}"/>
+                <sysincludepath path="${stub.includes.gluegen.cc}"/>
+                <includepath path="stub_includes/khr"/>
+                <includepath path="stub_includes/opengl"/>
+                <includepath path="stub_includes/libav/@{version.lav}"/>
+      
+                <!-- This is for the generated headers for handwritten C code -->
+                <includepath path="${src.c}"/>
+                <includepath path="${src.generated.c.libav}" />
+      
+                <!-- This must come last to not override real include paths -->
+                <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
+              </compiler>
+            </cc>
+          </sequential>
+        </outofdate>
+      </sequential>
+    </macrodef>  
+
     <macrodef name="c.build">
       <attribute name="c.compiler.src.files" />
+      <attribute name="c.compiler.obj.files" />
       <attribute name="compiler.cfg.id" />
       <attribute name="linker.cfg.id" />
       <attribute name="output.lib.name" />
@@ -1416,13 +1484,15 @@
       <sequential>
         <echo message="Output lib name = @{output.lib.name}" />
 
-        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
-        <property name="c.compiler.debug"     value="false" /> 
-        <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } --> 
-        <property name="c.compiler.optimise"  value="none" /> 
-
         <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
 
+        <patternset id="c.obj.files.none">
+        </patternset>
+        <patternset id="c.obj.files.ffmpeg.inject">
+          <include name="${rootrel.obj.joglsub}/ffmpeg_lavc53_lavf53_lavu51.*"/>
+          <include name="${rootrel.obj.joglsub}/ffmpeg_lavc54_lavf54_lavu52_lavr01.*"/>
+        </patternset>
+
         <patternset id="c.src.files.jogl.desktop">
           <include name="${rootrel.src.c}/JoglCommon.c"/>
           <include name="${rootrel.src.c}/GLDebugMessageHandler.c"/>
@@ -1434,9 +1504,7 @@
           <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
           <!-- FIXME: the Mixer should be moved to another library -->
           <!--include name="${rootrel.src.c}/Mixer.cpp" if="isWindows"/-->
-          <include name="${rootrel.src.c.libav}/jogamp_opengl_util_av_impl_FFMPEGStaticNatives.c"/>
-          <include name="${rootrel.src.c.libav}/lavc53.lavf53.lavu51/jogamp_opengl_util_av_impl_FFMPEGv08Natives.c"/>
-          <include name="${rootrel.src.c.libav}/lavc54.lavf54.lavu52.lavr01/jogamp_opengl_util_av_impl_FFMPEGv09Natives.c"/>
+          <include name="${rootrel.src.c.libav}/ffmpeg_static.c"/>
           <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="setup.addNativeOpenMAX"/>
           <include name="${rootrel.src.c.openmax}/jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c"  if="setup.addNativeOpenMAX"/>
 
@@ -1453,9 +1521,7 @@
           <include name="${rootrel.src.c}/JoglCommon.c"/>
           <include name="${rootrel.src.c}/GLDebugMessageHandler.c"/>
           <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
-          <include name="${rootrel.src.c.libav}/jogamp_opengl_util_av_impl_FFMPEGStaticNatives.c"/>
-          <include name="${rootrel.src.c.libav}/lavc53.lavf53.lavu51/jogamp_opengl_util_av_impl_FFMPEGv08Natives.c"/>
-          <include name="${rootrel.src.c.libav}/lavc54.lavf54.lavu52.lavr01/jogamp_opengl_util_av_impl_FFMPEGv09Natives.c"/>
+          <include name="${rootrel.src.c.libav}/ffmpeg_static.c"/>
           <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="setup.addNativeOpenMAX"/>
           <include name="${rootrel.src.c.openmax}/jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c"  if="setup.addNativeOpenMAX"/>
 
@@ -1479,7 +1545,7 @@
         <outofdate>
           <sourcefiles>
             <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
-            <fileset dir="${project.root}" includes="${rootrel.src.c.libav}/jogamp_opengl_util_av_impl_FFMPEGvXXNatives.c"/>
+            <fileset dir="${obj.joglsub}" includes="*jogl_ffmpegv08*, *jogl_ffmpegv09*"/> <!-- requires linkage -->
           </sourcefiles>
           <targetfiles>
             <fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.so"/>
@@ -1496,7 +1562,10 @@
                 exceptions="false" 
                 rtti="false">   
       
-              <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
+              <fileset dir="${project.root}">
+                <patternset refid="@{c.compiler.src.files}"/>
+                <patternset refid="@{c.compiler.obj.files}"/>
+              </fileset>
       
               <compiler extends="@{compiler.cfg.id}" >
                 <sysincludepath path="${java.includes.dir}"/>
@@ -1564,10 +1633,21 @@
       <!-- Generate the waveout Mixer header -->
       <!-- FIXME: this is temporary until we move this to another workspace -->
       <!--javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="com.jogamp.audio.windows.waveout.Mixer" /-->
+
+      <c.build.ffmpeg version.lav="lavc53_lavf53_lavu51"
+               output.lib.name="jogl_ffmpegv08"
+               compiler.cfg.id="${compiler.cfg.id}"
+               linker.cfg.id="${linker.cfg.id.os}"/>
+
+      <c.build.ffmpeg version.lav="lavc54_lavf54_lavu52_lavr01"
+               output.lib.name="jogl_ffmpegv09"
+               compiler.cfg.id="${compiler.cfg.id}"
+               linker.cfg.id="${linker.cfg.id.os}"/>
     </target>
 
     <target name="c.build.jogl.desktop" unless="setup.noNativeDesktop">
       <c.build c.compiler.src.files="c.src.files.jogl.desktop"
+               c.compiler.obj.files="c.obj.files.ffmpeg.inject"
                output.lib.name="jogl_desktop"
                compiler.cfg.id="${compiler.cfg.id}"
                linker.cfg.id="${linker.cfg.id.os}"/>
@@ -1575,6 +1655,7 @@
 
     <target name="c.build.jogl.mobile">
       <c.build c.compiler.src.files="c.src.files.jogl.mobile"
+               c.compiler.obj.files="c.obj.files.ffmpeg.inject"
                output.lib.name="jogl_mobile"
                compiler.cfg.id="${compiler.cfg.id}"
                linker.cfg.id="${linker.cfg.id.os}"/>
@@ -1582,6 +1663,7 @@
 
     <target name="c.build.jogl.cg" if="setup.addNativeNVidiaCG">
       <c.build c.compiler.src.files="c.src.files.cg"
+               c.compiler.obj.files="c.obj.files.none"
                output.lib.name="jogl_cg"
                compiler.cfg.id="${compiler.cfg.id}"
                linker.cfg.id="${linker.cfg.id.os}"/>
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/avcodec.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/avcodec.h
index 2451294c1..2451294c1 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/avcodec.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/avcodec.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/avfft.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/avfft.h
index 91fe2f429..91fe2f429 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/avfft.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/avfft.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/dxva2.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/dxva2.h
index 374ae039a..374ae039a 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/dxva2.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/dxva2.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/opt.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/opt.h
index 2380e7433..2380e7433 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/opt.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/opt.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/vaapi.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/vaapi.h
index 36fb386ac..36fb386ac 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/vaapi.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/vaapi.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/vda.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/vda.h
index 2cb51c5f5..2cb51c5f5 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/vda.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/vda.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/vdpau.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/vdpau.h
index 6f1386067..6f1386067 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/vdpau.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/vdpau.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/version.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/version.h
index 77e16823f..77e16823f 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/version.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/version.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/xvmc.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/xvmc.h
index 1239015fc..1239015fc 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavcodec/xvmc.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavcodec/xvmc.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavformat/avformat.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavformat/avformat.h
index 22a89d3cd..22a89d3cd 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavformat/avformat.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavformat/avformat.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavformat/avio.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavformat/avio.h
index 78935d941..78935d941 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavformat/avio.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavformat/avio.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavformat/version.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavformat/version.h
index 009a60b1a..009a60b1a 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavformat/version.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavformat/version.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/adler32.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/adler32.h
index a8ff6f9d4..a8ff6f9d4 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/adler32.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/adler32.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/aes.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/aes.h
index cf7b46209..cf7b46209 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/aes.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/aes.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/attributes.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/attributes.h
index ef990a1d4..ef990a1d4 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/attributes.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/attributes.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/audioconvert.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/audioconvert.h
index 00ed0ff7b..00ed0ff7b 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/audioconvert.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/audioconvert.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/avassert.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/avassert.h
index b223d26e8..b223d26e8 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/avassert.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/avassert.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/avconfig.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/avconfig.h
index f10aa6186..f10aa6186 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/avconfig.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/avconfig.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/avstring.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/avstring.h
index ed4e465cb..ed4e465cb 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/avstring.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/avstring.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/avutil.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/avutil.h
index 05e924837..05e924837 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/avutil.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/avutil.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/base64.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/base64.h
index 4750cf5c7..4750cf5c7 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/base64.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/base64.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/bswap.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/bswap.h
index 8a350e1cd..8a350e1cd 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/bswap.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/bswap.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/common.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/common.h
index c99d85847..c99d85847 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/common.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/common.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/cpu.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/cpu.h
index df7bf4421..df7bf4421 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/cpu.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/cpu.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/crc.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/crc.h
index a93411941..a93411941 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/crc.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/crc.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/dict.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/dict.h
index 6e28b6140..6e28b6140 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/dict.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/dict.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/error.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/error.h
index 11bcc5c4c..11bcc5c4c 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/error.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/error.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/eval.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/eval.h
index ccb29e7a3..ccb29e7a3 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/eval.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/eval.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/fifo.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/fifo.h
index f10623930..f10623930 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/fifo.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/fifo.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/file.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/file.h
index c481c37f9..c481c37f9 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/file.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/file.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/imgutils.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/imgutils.h
index 3815a49ae..3815a49ae 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/imgutils.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/imgutils.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/intfloat.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/intfloat.h
index 9db624a6c..9db624a6c 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/intfloat.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/intfloat.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/intfloat_readwrite.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/intfloat_readwrite.h
index f093b92cd..f093b92cd 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/intfloat_readwrite.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/intfloat_readwrite.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/intreadwrite.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/intreadwrite.h
index 01eb27804..01eb27804 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/intreadwrite.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/intreadwrite.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/lfg.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/lfg.h
index 904d00a66..904d00a66 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/lfg.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/lfg.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/log.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/log.h
index 0678e1a3b..0678e1a3b 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/log.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/log.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/lzo.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/lzo.h
index 1b774a53b..1b774a53b 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/lzo.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/lzo.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/mathematics.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/mathematics.h
index 0b072ebe6..0b072ebe6 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/mathematics.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/mathematics.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/md5.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/md5.h
index 1412ee240..1412ee240 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/md5.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/md5.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/mem.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/mem.h
index cd8490b2d..cd8490b2d 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/mem.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/mem.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/opt.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/opt.h
index 19549408e..19549408e 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/opt.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/opt.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/parseutils.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/parseutils.h
index 0844abb2f..0844abb2f 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/parseutils.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/parseutils.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/pixdesc.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/pixdesc.h
index b5972c78f..b5972c78f 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/pixdesc.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/pixdesc.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/pixfmt.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/pixfmt.h
index bd898bdc8..bd898bdc8 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/pixfmt.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/pixfmt.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/random_seed.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/random_seed.h
index b1fad13d0..b1fad13d0 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/random_seed.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/random_seed.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/rational.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/rational.h
index 0ec18ec96..0ec18ec96 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/rational.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/rational.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/samplefmt.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/samplefmt.h
index b6715561d..b6715561d 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/samplefmt.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/samplefmt.h
diff --git a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/sha.h b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/sha.h
index 8350954c4..8350954c4 100644
--- a/make/stub_includes/libav/lavc53.lavf53.lavu51/libavutil/sha.h
+++ b/make/stub_includes/libav/lavc53_lavf53_lavu51/libavutil/sha.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/avcodec.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/avcodec.h
index e6b8ec626..e6b8ec626 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/avcodec.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/avcodec.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/avfft.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/avfft.h
index b89618258..b89618258 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/avfft.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/avfft.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/dxva2.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/dxva2.h
index c06f1f333..c06f1f333 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/dxva2.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/dxva2.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/old_codec_ids.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/old_codec_ids.h
index 2b72e38d2..2b72e38d2 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/old_codec_ids.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/old_codec_ids.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/vaapi.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/vaapi.h
index 39e88259d..39e88259d 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/vaapi.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/vaapi.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/vda.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/vda.h
index f0ec2bfec..f0ec2bfec 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/vda.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/vda.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/vdpau.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/vdpau.h
index 241ff1905..241ff1905 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/vdpau.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/vdpau.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/version.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/version.h
index 348ce99f2..348ce99f2 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/version.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/version.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/xvmc.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/xvmc.h
index 1f77e4efc..1f77e4efc 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavcodec/xvmc.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavcodec/xvmc.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavformat/avformat.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavformat/avformat.h
index 149b66f1c..149b66f1c 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavformat/avformat.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavformat/avformat.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavformat/avio.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavformat/avio.h
index b6d3cb33b..b6d3cb33b 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavformat/avio.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavformat/avio.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavformat/version.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavformat/version.h
index c2c1e3a8d..c2c1e3a8d 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavformat/version.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavformat/version.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavresample/avresample.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavresample/avresample.h
index 001278740..001278740 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavresample/avresample.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavresample/avresample.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavresample/version.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavresample/version.h
index ebcd07f57..ebcd07f57 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavresample/version.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavresample/version.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/adler32.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/adler32.h
index a8ff6f9d4..a8ff6f9d4 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/adler32.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/adler32.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/aes.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/aes.h
index edff275b7..edff275b7 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/aes.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/aes.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/attributes.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/attributes.h
index 292a0a1a8..292a0a1a8 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/attributes.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/attributes.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/audio_fifo.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/audio_fifo.h
index 8c7638825..8c7638825 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/audio_fifo.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/audio_fifo.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/audioconvert.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/audioconvert.h
index 300a67cd3..300a67cd3 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/audioconvert.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/audioconvert.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/avassert.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/avassert.h
index b223d26e8..b223d26e8 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/avassert.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/avassert.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/avconfig.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/avconfig.h
index f10aa6186..f10aa6186 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/avconfig.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/avconfig.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/avstring.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/avstring.h
index acd6610d3..acd6610d3 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/avstring.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/avstring.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/avutil.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/avutil.h
index 33f9bea72..33f9bea72 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/avutil.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/avutil.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/base64.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/base64.h
index 4750cf5c7..4750cf5c7 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/base64.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/base64.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/blowfish.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/blowfish.h
index 8c29536cf..8c29536cf 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/blowfish.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/blowfish.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/bswap.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/bswap.h
index 8a350e1cd..8a350e1cd 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/bswap.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/bswap.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/channel_layout.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/channel_layout.h
index 15b6887a6..15b6887a6 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/channel_layout.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/channel_layout.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/common.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/common.h
index cc4df16e4..cc4df16e4 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/common.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/common.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/cpu.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/cpu.h
index 4929512c6..4929512c6 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/cpu.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/cpu.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/crc.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/crc.h
index 0540619d2..0540619d2 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/crc.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/crc.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/dict.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/dict.h
index 492da9a41..492da9a41 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/dict.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/dict.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/error.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/error.h
index 3dfd8807f..3dfd8807f 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/error.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/error.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/eval.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/eval.h
index ccb29e7a3..ccb29e7a3 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/eval.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/eval.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/fifo.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/fifo.h
index ea30f5d2b..ea30f5d2b 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/fifo.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/fifo.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/file.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/file.h
index e3f02a830..e3f02a830 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/file.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/file.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/imgutils.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/imgutils.h
index 71510132a..71510132a 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/imgutils.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/imgutils.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/intfloat.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/intfloat.h
index 38d26ad87..38d26ad87 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/intfloat.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/intfloat.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/intfloat_readwrite.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/intfloat_readwrite.h
index f093b92cd..f093b92cd 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/intfloat_readwrite.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/intfloat_readwrite.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/intreadwrite.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/intreadwrite.h
index f77fd60f3..f77fd60f3 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/intreadwrite.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/intreadwrite.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/lfg.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/lfg.h
index 5e526c1da..5e526c1da 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/lfg.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/lfg.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/log.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/log.h
index 7b173302f..7b173302f 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/log.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/log.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/lzo.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/lzo.h
index 9d7e8f1dc..9d7e8f1dc 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/lzo.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/lzo.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/mathematics.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/mathematics.h
index 043dd0faf..043dd0faf 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/mathematics.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/mathematics.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/md5.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/md5.h
index 29e4e7c2b..29e4e7c2b 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/md5.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/md5.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/mem.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/mem.h
index 8f4722447..8f4722447 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/mem.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/mem.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/old_pix_fmts.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/old_pix_fmts.h
index 31765aed5..31765aed5 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/old_pix_fmts.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/old_pix_fmts.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/opt.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/opt.h
index 2d3cc731e..2d3cc731e 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/opt.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/opt.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/parseutils.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/parseutils.h
index 0844abb2f..0844abb2f 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/parseutils.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/parseutils.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/pixdesc.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/pixdesc.h
index 47e6bb838..47e6bb838 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/pixdesc.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/pixdesc.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/pixfmt.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/pixfmt.h
index 1072f0089..1072f0089 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/pixfmt.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/pixfmt.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/random_seed.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/random_seed.h
index b1fad13d0..b1fad13d0 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/random_seed.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/random_seed.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/rational.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/rational.h
index 5d7dab7fd..5d7dab7fd 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/rational.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/rational.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/samplefmt.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/samplefmt.h
index 33cbdedf5..33cbdedf5 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/samplefmt.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/samplefmt.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/sha.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/sha.h
index 4c9a0c909..4c9a0c909 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/sha.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/sha.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/time.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/time.h
index b01a97d77..b01a97d77 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/time.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/time.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/version.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/version.h
index 1dbb11ca2..1dbb11ca2 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/version.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/version.h
diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/xtea.h b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/xtea.h
index 7d2b07bbc..7d2b07bbc 100644
--- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/xtea.h
+++ b/make/stub_includes/libav/lavc54_lavf54_lavu52_lavr01/libavutil/xtea.h
diff --git a/src/jogl/native/libav/jogamp_opengl_util_av_impl_FFMPEGvXXNatives.c b/src/jogl/native/libav/ffmpeg_impl_template.c
index aaa26cfb1..60cddef45 100644
--- a/src/jogl/native/libav/jogamp_opengl_util_av_impl_FFMPEGvXXNatives.c
+++ b/src/jogl/native/libav/ffmpeg_impl_template.c
@@ -30,14 +30,14 @@
 
 #include "JoglCommon.h"
 #include "ffmpeg_tool.h"
-/**
+
 #include "libavutil/pixdesc.h"
 #include "libavutil/samplefmt.h"
 #if LIBAVUTIL_VERSION_MAJOR < 53
     #include "libavutil/audioconvert.h"
     // 52: #include "libavutil/channel_layout.h"
 #endif
-*/
+
 #include <GL/gl.h>
 
 static const char * const ClazzNameFFMPEGMediaPlayer = "jogamp/opengl/util/av/impl/FFMPEGMediaPlayer";
@@ -501,17 +501,6 @@ JNIEXPORT jlong JNICALL FF_FUNC(createInstance0)
         pAV->useRefCountedFrames = 0;
     #endif
 
-    // Register all formats and codecs
-    sp_avcodec_register_all();
-    if(HAS_FUNC(sp_avdevice_register_all)) {
-        sp_avdevice_register_all();
-    }
-    sp_av_register_all();
-    // Network too ..
-    if(HAS_FUNC(sp_avformat_network_init)) {
-        sp_avformat_network_init();
-    }
-
     pAV->ffmpegMediaPlayer = (*env)->NewGlobalRef(env, ffmpegMediaPlayer);
     pAV->verbose = verbose;
     pAV->vid=AV_STREAM_ID_AUTO;
@@ -599,6 +588,17 @@ JNIEXPORT void JNICALL FF_FUNC(setStream0)
         return;
     }
 
+    // Register all formats and codecs
+    sp_avcodec_register_all();
+    if( jIsCameraInput && HAS_FUNC(sp_avdevice_register_all) ) {
+        sp_avdevice_register_all();
+    }
+    sp_av_register_all();
+    // Network too ..
+    if(HAS_FUNC(sp_avformat_network_init)) {
+        sp_avformat_network_init();
+    }
+
     pAV->pFormatCtx = sp_avformat_alloc_context();
 
     // Open video file
diff --git a/src/jogl/native/libav/ffmpeg_lavc53_lavf53_lavu51.c b/src/jogl/native/libav/ffmpeg_lavc53_lavf53_lavu51.c
new file mode 100644
index 000000000..edce2ba1d
--- /dev/null
+++ b/src/jogl/native/libav/ffmpeg_lavc53_lavf53_lavu51.c
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2013 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+ 
+#include "jogamp_opengl_util_av_impl_FFMPEGv08Natives.h"
+
+#define FF_FUNC(METHOD) Java_jogamp_opengl_util_av_impl_FFMPEGv08Natives_ ## METHOD
+
+#include "ffmpeg_impl_template.c"
diff --git a/src/jogl/native/libav/ffmpeg_lavc54_lavf54_lavu52_lavr01.c b/src/jogl/native/libav/ffmpeg_lavc54_lavf54_lavu52_lavr01.c
new file mode 100644
index 000000000..651a64976
--- /dev/null
+++ b/src/jogl/native/libav/ffmpeg_lavc54_lavf54_lavu52_lavr01.c
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2013 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+ 
+#include "jogamp_opengl_util_av_impl_FFMPEGv09Natives.h"
+
+#define FF_FUNC(METHOD) Java_jogamp_opengl_util_av_impl_FFMPEGv09Natives_ ## METHOD
+
+#include "ffmpeg_impl_template.c"
diff --git a/src/jogl/native/libav/jogamp_opengl_util_av_impl_FFMPEGStaticNatives.c b/src/jogl/native/libav/ffmpeg_static.c
index ee7f3f47d..171dda6a7 100644
--- a/src/jogl/native/libav/jogamp_opengl_util_av_impl_FFMPEGStaticNatives.c
+++ b/src/jogl/native/libav/ffmpeg_static.c
@@ -42,7 +42,7 @@
 
 #include "JoglCommon.h"
 
-#include <GL/gl.h>
+#include <GL/gl-platform.h>
 
 typedef unsigned (APIENTRYP AV_GET_VERSION)(void);
 
diff --git a/src/jogl/native/libav/ffmpeg_tool.h b/src/jogl/native/libav/ffmpeg_tool.h
index 90d795b91..ea9625da6 100644
--- a/src/jogl/native/libav/ffmpeg_tool.h
+++ b/src/jogl/native/libav/ffmpeg_tool.h
@@ -29,7 +29,6 @@
 #ifndef _FFMPEG_TOOL_H
 #define _FFMPEG_TOOL_H
 
-/***
 #ifdef _WIN32
     #include <windows.h>
     // __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
@@ -49,8 +48,6 @@
 #include "libavresample/avresample.h"
 #endif
 
-*/
-
 #ifndef LIBAVRESAMPLE_VERSION_MAJOR
 #define LIBAVRESAMPLE_VERSION_MAJOR 0
 typedef void* AVAudioResampleContext;
diff --git a/src/jogl/native/libav/lavc53.lavf53.lavu51/jogamp_opengl_util_av_impl_FFMPEGv08Natives.c b/src/jogl/native/libav/lavc53.lavf53.lavu51/jogamp_opengl_util_av_impl_FFMPEGv08Natives.c
deleted file mode 100644
index 217ca8cc4..000000000
--- a/src/jogl/native/libav/lavc53.lavf53.lavu51/jogamp_opengl_util_av_impl_FFMPEGv08Natives.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifdef _WIN32
-    #include <windows.h>
-    // __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
-
-    #define usleep(t)    Sleep((t) / 1000)
-#endif
-
-#include <gluegen_stdint.h>
-#include <gluegen_inttypes.h>
-#include <gluegen_stddef.h>
-#include <gluegen_stdint.h>
-
-#include "libavcodec/avcodec.h"
-#include "libavformat/avformat.h"
-#include "libavutil/avutil.h"
-#if LIBAVCODEC_VERSION_MAJOR >= 54
-#include "libavresample/avresample.h"
-#endif
-
-#include "libavutil/pixdesc.h"
-#include "libavutil/samplefmt.h"
-#if LIBAVUTIL_VERSION_MAJOR < 53
-    #include "libavutil/audioconvert.h"
-    // 52: #include "libavutil/channel_layout.h"
-#endif
-
-#include "jogamp_opengl_util_av_impl_FFMPEGv08Natives.h"
-
-#define FF_FUNC(METHOD) Java_jogamp_opengl_util_av_impl_FFMPEGv08Natives_ ## METHOD
-
-#include "../jogamp_opengl_util_av_impl_FFMPEGvXXNatives.c"
diff --git a/src/jogl/native/libav/lavc54.lavf54.lavu52.lavr01/jogamp_opengl_util_av_impl_FFMPEGv09Natives.c b/src/jogl/native/libav/lavc54.lavf54.lavu52.lavr01/jogamp_opengl_util_av_impl_FFMPEGv09Natives.c
deleted file mode 100644
index 53f72754f..000000000
--- a/src/jogl/native/libav/lavc54.lavf54.lavu52.lavr01/jogamp_opengl_util_av_impl_FFMPEGv09Natives.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifdef _WIN32
-    #include <windows.h>
-    // __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
-
-    #define usleep(t)    Sleep((t) / 1000)
-#endif
-
-#include <gluegen_stdint.h>
-#include <gluegen_inttypes.h>
-#include <gluegen_stddef.h>
-#include <gluegen_stdint.h>
-
-#include "libavcodec/avcodec.h"
-#include "libavformat/avformat.h"
-#include "libavutil/avutil.h"
-#if LIBAVCODEC_VERSION_MAJOR >= 54
-#include "libavresample/avresample.h"
-#endif
-
-#include "libavutil/pixdesc.h"
-#include "libavutil/samplefmt.h"
-#if LIBAVUTIL_VERSION_MAJOR < 53
-    #include "libavutil/audioconvert.h"
-    // 52: #include "libavutil/channel_layout.h"
-#endif
-
-#include "jogamp_opengl_util_av_impl_FFMPEGv09Natives.h"
-
-#define FF_FUNC(METHOD) Java_jogamp_opengl_util_av_impl_FFMPEGv09Natives_ ## METHOD
-
-#include "../jogamp_opengl_util_av_impl_FFMPEGvXXNatives.c"