From: Mike Jerris <mike@jerris.com>
Date: Fri, 24 Aug 2018 15:27:00 +0000 (+0000)
Subject: Merge pull request #1574 in FS/freeswitch from fs-11189-av-fix to master
X-Git-Tag: v1.8.2~1^2~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59df2a31b026f61d7c5234b5c784e18b1ea57fcc;p=thirdparty%2Ffreeswitch.git

Merge pull request #1574 in FS/freeswitch from fs-11189-av-fix to master

* commit 'be782776b535c52f49f0d64145ee9dc3e12e4d19':
  FS-11189 add back default flags LOOP_FILTER and PSNR for H264
  FS-11189 set default cpu string to cpu/2/4 if not configured
  FS-11189 add helper functions and macros to dump encoder context params
  FS-11189 add default av conf to vanilla
  FS-11189 use AV_INPUT_BUFFER_PADDING_SIZE instead of FF_INPUT_BUFFER_PADDING_SIZE in newer ffmpeg
---

59df2a31b026f61d7c5234b5c784e18b1ea57fcc