[FFmpeg-cvslog] r23550 - in branches/0.6: . configure

siretart subversion
Wed Jun 9 17:55:02 CEST 2010


Author: siretart
Date: Wed Jun  9 17:55:02 2010
New Revision: 23550

Log:
librtmp may link to different ssl implementations

Make sure we link using the right libs by using pkg-config



backport r23511 by lu_zero

Modified:
   branches/0.6/   (props changed)
   branches/0.6/configure

Modified: branches/0.6/configure
==============================================================================
--- branches/0.6/configure	Wed Jun  9 17:54:27 2010	(r23549)
+++ branches/0.6/configure	Wed Jun  9 17:55:02 2010	(r23550)
@@ -2610,7 +2610,7 @@ enabled libnut     && require  libnut li
 enabled libopencore_amrnb  && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb -lm
 enabled libopencore_amrwb  && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb -lm
 enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
-enabled librtmp    && require  librtmp librtmp/rtmp.h RTMP_Init -lrtmp
+enabled librtmp    && require  librtmp librtmp/rtmp.h RTMP_Init $(pkg-config --libs librtmp)
 enabled libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) &&
                            require libschroedinger schroedinger/schro.h schro_init $(pkg-config --libs schroedinger-1.0)
 enabled libspeex   && require  libspeex speex/speex.h speex_decoder_init -lspeex



More information about the ffmpeg-cvslog mailing list