diff options
| author | Sven Gothel <[email protected]> | 2013-08-28 12:44:06 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-08-28 12:44:06 +0200 |
| commit | 9bf14f3c6bf98bd86913bec6e7feb54537f9b7d3 (patch) | |
| tree | 7b50a3db64dd1335003bbac371f18b4244c06299 /make/build-jogl.xml | |
| parent | b99511d438a6c621a5afc582168cca69bd2eb9da (diff) | |
Fix libav/ffmpeg compilation; FFMPEGMediaPlayer Enahncements (More YUV*, Use def. high camera options, cleanup symbols)
- Fix libav/ffmpeg compilation
- Split native GLContext code from JoglCommon
- JoglCommon is required for ffmpeg_* c-compile/link
- Supported versions now:
- 0.8 53.53.51
- 9.0 54.54.52
- FFMPEGMediaPlayer
- Update API doc, add compatibility .. etc
- Pixel format conversions (via shader texture lookup func):
- YUV420P, YUVJ420P
- YUV422P, YUVJ422P
- YUYV422
- Properly handle aid/vid
- In camera mode: set high default values
- TODO: Make it configurable via camera URI:
- video_size
- framerate
- ?
- FFMPEGDynamicLibraryBundleInfo
- Cleanup symbols / remove unused (pre 53)
- Add av_dict_* methods
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 58ce64b6f..582e8b654 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1424,6 +1424,7 @@ <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition> <patternset id="c.src.files.@{version.lav}"> + <include name="${rootrel.src.c}/JoglCommon.c"/> <include name="${rootrel.src.c.libav}/ffmpeg_@{version.lav}.c"/> </patternset> @@ -1495,6 +1496,7 @@ <patternset id="c.src.files.jogl.desktop"> <include name="${rootrel.src.c}/JoglCommon.c"/> + <include name="${rootrel.src.c}/GLContext.c"/> <include name="${rootrel.src.c}/GLDebugMessageHandler.c"/> <include name="${rootrel.src.c}/timespec.c" if="isOSX"/> <!-- currently only used for OSX --> <include name="${rootrel.src.c}/macosx/MacOSXCustomCGLCode.c" if="isOSX"/> @@ -1519,6 +1521,7 @@ <patternset id="c.src.files.jogl.mobile"> <include name="${rootrel.src.c}/JoglCommon.c"/> + <include name="${rootrel.src.c}/GLContext.c"/> <include name="${rootrel.src.c}/GLDebugMessageHandler.c"/> <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/> <include name="${rootrel.src.c.libav}/ffmpeg_static.c"/> |