[asterisk-commits] phsultan: branch phsultan/rtmp-support r205764 - in /team/phsultan/rtmp-suppo...

[SVN commits to the Asterisk project]

Author: phsultan
Date: Fri Jul 10 04:35:56 2009
New Revision: 205764

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=205764
Log:
Dependency check for FFMPEG's libavcodec

Modified:
    team/phsultan/rtmp-support/build_tools/menuselect-deps.in
    team/phsultan/rtmp-support/configure.ac
    team/phsultan/rtmp-support/makeopts.in

Modified: team/phsultan/rtmp-support/build_tools/menuselect-deps.in
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/rtmp-support/build_tools/menuselect-deps.in?view=diff&rev=205764&r1=205763&r2=205764
==============================================================================
--- team/phsultan/rtmp-support/build_tools/menuselect-deps.in (original)
+++ team/phsultan/rtmp-support/build_tools/menuselect-deps.in Fri Jul 10 04:35:56 2009
@@ -1,4 +1,5 @@
 ALSA=@PBX_ALSA@
+AVCODEC=@PBX_AVCODEC@
 BLUETOOTH=@PBX_BLUETOOTH@
 CRYPTO=@PBX_CRYPTO@
 CURL=@PBX_CURL@

Modified: team/phsultan/rtmp-support/configure.ac
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/rtmp-support/configure.ac?view=diff&rev=205764&r1=205763&r2=205764
==============================================================================
--- team/phsultan/rtmp-support/configure.ac (original)
+++ team/phsultan/rtmp-support/configure.ac Fri Jul 10 04:35:56 2009
@@ -240,6 +240,7 @@
 AST_EXT_LIB_SETUP([CRYPTO], [OpenSSL Cryptography support], [crypto])
 AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])
 AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec])
+AST_EXT_LIB_SETUP([AVCODEC], [Ffmpeg and avcodec library], [avcodec]
 AST_EXT_LIB_SETUP([GSM], [External GSM library], [gsm], [, use 'internal' GSM otherwise])
 AST_EXT_LIB_SETUP([GTK], [gtk libraries], [gtk])
 AST_EXT_LIB_SETUP([GTK2], [gtk2 libraries], [gtk2])
@@ -1694,6 +1695,7 @@
 AST_EXT_TOOL_CHECK([SDL], [sdl-config])
 AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
 AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])
+AST_EXT_LIB_CHECK([AVCODEC], [avcodec], [avcodec_init], [libavcodec/avcodec.h])
 
 # possible places for video4linux version 1
 AC_CHECK_HEADER([linux/videodev.h],

Modified: team/phsultan/rtmp-support/makeopts.in
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/rtmp-support/makeopts.in?view=diff&rev=205764&r1=205763&r2=205764
==============================================================================
--- team/phsultan/rtmp-support/makeopts.in (original)
+++ team/phsultan/rtmp-support/makeopts.in Fri Jul 10 04:35:56 2009
@@ -117,6 +117,9 @@
 IKSEMEL_INCLUDE=@IKSEMEL_INCLUDE@
 IKSEMEL_LIB=@IKSEMEL_LIB@
 
+AVCODEC_INCLUDE=@AVCODEC_INCLUDE@
+AVCODEC_LIB=@AVCODEC_LIB@
+
 IMAP_TK_INCLUDE=@IMAP_TK_INCLUDE@
 IMAP_TK_LIB=@IMAP_TK_LIB@