FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mpeg2enc: fix build with 1.9.0 release again after recent fixes for mjpegtools 2.0.0

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=650970
This commit is contained in:
Tim-Philipp Müller 2011-05-25 14:42:38 +01:00
parent 4a7057048f
commit 202a548030
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -1071,7 +1071,10 @@ PKG_CHECK_EXISTS(mjpegtools >= 1.6.1.93 mjpegtools < 1.8.0, [
PKG_CHECK_EXISTS(mjpegtools >= 1.8.0 mjpegtools < 1.9.0, [ PKG_CHECK_EXISTS(mjpegtools >= 1.8.0 mjpegtools < 1.9.0, [
mjpegtools_api=10800 mjpegtools_api=10800
], [ ], [
PKG_CHECK_MODULES(MJPEG, mjpegtools >= 1.9.0, [ PKG_CHECK_EXISTS(mjpegtools >= 2.0.0, [
mjpegtools_api=20000
], [
PKG_CHECK_MODULES(MJPEG, mjpegtools >= 1.9.0 mjpegtools < 2.0.0, [
dnl logging API changed in release candidates dnl logging API changed in release candidates
OLD_CFLAGS="$CFLAGS" OLD_CFLAGS="$CFLAGS"
OLD_LIBS="$LIBS" OLD_LIBS="$LIBS"
@ -1088,6 +1091,7 @@ PKG_CHECK_EXISTS(mjpegtools >= 1.6.1.93 mjpegtools < 1.8.0, [
mjpegtools_api=0 mjpegtools_api=0
]) ])
]) ])
])
]) ])
AC_DEFINE_UNQUOTED(GST_MJPEGTOOLS_API, $mjpegtools_api, AC_DEFINE_UNQUOTED(GST_MJPEGTOOLS_API, $mjpegtools_api,
[mjpegtools API evolution]) [mjpegtools API evolution])

2
ext/mpeg2enc/gstmpeg2encoder.cc
View File

@ -26,7 +26,7 @@
#include <mpegconsts.h> #include <mpegconsts.h>
#include <quantize.hh> #include <quantize.hh>
#if GST_MJPEGTOOLS_API >= 10903 #if GST_MJPEGTOOLS_API >= 20000
#include <ontheflyratectlpass1.hh> #include <ontheflyratectlpass1.hh>
#include <ontheflyratectlpass2.hh> #include <ontheflyratectlpass2.hh>
#elif GST_MJPEGTOOLS_API >= 10900 #elif GST_MJPEGTOOLS_API >= 10900