Commit 4add780c authored by Simon Morlat's avatar Simon Morlat

improve vpx8 detection

parent 1707c71a
......@@ -202,8 +202,15 @@ AC_DEFUN([MS_CHECK_VIDEO],[
esac],[vp8=true])
if test x$vp8 = xtrue; then
PKG_CHECK_MODULES(VP8, [vpx >= 0.9.6 ], [have_vp8=yes],
PKG_CHECK_MODULES(VP8, [vpx >= 0.9.6 ], [have_vp8=yes],
[have_vp8=no])
if test "$have_vp8" = "no" ; then
AC_CHECK_HEADERS([vpx/vpx_encoder.h],
[ have_vp8=yes
VP8_LIBS="-lvpx"
AC_SUBST(VP8_LIBS)
])
fi
fi
if test "$ffmpeg" = "false"; then
......
......@@ -677,7 +677,7 @@ static mblk_t *skip_jpeg_headers(mblk_t *full_frame, mblk_t **lqt, mblk_t **cqt)
uint8_t *pbuf_ptr=full_frame->b_rptr;
uint8_t *buf_end=full_frame->b_wptr;
ms_message("image size: %li)", buf_end-pbuf_ptr);
ms_message("image size: %li)", (long)(buf_end-pbuf_ptr));
*lqt=NULL;
*cqt=NULL;
......@@ -685,7 +685,7 @@ static mblk_t *skip_jpeg_headers(mblk_t *full_frame, mblk_t **lqt, mblk_t **cqt)
err = find_marker(&pbuf_ptr, buf_end);
while (err!=-1)
{
ms_message("marker found: %x (offset from beginning %li)", err, pbuf_ptr-full_frame->b_rptr);
ms_message("marker found: %x (offset from beginning %li)", err, (long)(pbuf_ptr-full_frame->b_rptr));
if (err==0xdb)
{
/* copy DQT table */
......
/*
* vp8.c -Android Media plugin for Linphone-
* vp8.c -VP8 encoder/decoder wrapper
*
*
* Copyright (C) 2011 Belledonne Communications, Grenoble, France
......@@ -12,7 +12,7 @@
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
......
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