diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index 3d2182161..08d21ca5c 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -238,7 +238,7 @@ vhost crop.transcode.vhost.com { } } } -# the logo filter of ffmpeg, @see: http://ffmpeg.org/ffmpeg-filters.html#crop +# the logo filter of ffmpeg, @see: http://ffmpeg.org/ffmpeg-filters.html#overlay vhost logo.transcode.vhost.com { transcode { enabled on; @@ -246,7 +246,8 @@ vhost logo.transcode.vhost.com { engine logo { enabled on; vfilter { - vf 'crop=200:100:10:10'; + i ./doc/ffmpeg-logo.png; + filter_complex 'overlay=10:10'; } vcodec libx264; vbitrate 300; diff --git a/trunk/configure b/trunk/configure index cc2522d82..3a74e4844 100755 --- a/trunk/configure +++ b/trunk/configure @@ -162,6 +162,12 @@ BUILD_KEY="bandwidth" APP_MAIN="srs_main_bandcheck" APP_NAME="bandwidth" SO_PATH echo 'configure ok! ' +##################################################################################### +# when configure success, prepare build +##################################################################################### +# create objs/logs for ffmpeg to write log. +mkdir -p ${SRS_OBJS}/logs + ##################################################################################### # configure summary #####################################################################################