From: Seven Du <dujinfang@gmail.com>
Date: Fri, 18 Mar 2016 01:09:32 +0000 (-0500)
Subject: Merge pull request #759 in FS/freeswitch from FS-8406 to master
X-Git-Tag: v1.6.7^2~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6870b4bba4480af4325361989b577806160e1970;p=thirdparty%2Ffreeswitch.git

Merge pull request #759 in FS/freeswitch from FS-8406 to master

* commit '3d90d752fca16016d4a3556cb02bf9db837feffa':
  FS-8406 #resolve #comment improvement to drop video packets on slow rtmp link
  FS-8406 #comment add options to scale down cavas size, fps and bandwidth
---

6870b4bba4480af4325361989b577806160e1970