main/ffmpeg: security upgrade to 2.8.5 (CVE-2016-1897,CVE-2016-1898)

fixes #5029

(cherry picked from commit 8c68262f)

main/ffmpeg/APKBUILD

 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ffmpeg
-pkgver=2.8.3
+pkgver=2.8.5
 pkgrel=0
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 url="http://ffmpeg.org/"
@@ -16,7 +16,6 @@ depends=
 source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2
 	configure-dlvsym.patch
 	fix-flv-extradata.patch
-	fix-mpegtsenc-cbr-scaling.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -84,15 +83,12 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
 }
 
-md5sums="937a6573ba399cf3e6808c9c6ea3d6d6  ffmpeg-2.8.3.tar.bz2
+md5sums="989d9024313c2b7e2eeaed58b751c0ee  ffmpeg-2.8.5.tar.bz2
 d041c60890392d80f74a567523f4c54d  configure-dlvsym.patch
-5f39e099cd7dfe71bb2f6b6615623d67  fix-flv-extradata.patch
-9861cd786636500c2f28bd759bbea0e2  fix-mpegtsenc-cbr-scaling.patch"
-sha256sums="1bcf993a71839bb4a37eaa0c51daf315932b6dad6089f672294545cc51a5caf6  ffmpeg-2.8.3.tar.bz2
+5f39e099cd7dfe71bb2f6b6615623d67  fix-flv-extradata.patch"
+sha256sums="3b6d9951533323ee64a21d0aa7667a780b3470bfe4e0fb7c1b33307ce290615a  ffmpeg-2.8.5.tar.bz2
 ffd6beadaea4cdbc1326fe396d8cd34b3efb791a865a32f64b3fe998b679c1d0  configure-dlvsym.patch
-8324bd3e154c151e64df36afd1edf05b8dc2dcd8e520208be0355a34b4209ad5  fix-flv-extradata.patch
-2724a333a96c24a77de8302228d8dde4679be3616ad2426cb3a3aa645135c73b  fix-mpegtsenc-cbr-scaling.patch"
-sha512sums="aadfab7db84b85cbfe44a5c7b47e447a1711c3d78fa195f30d3f6644e95842c8d484172e4c98f75cbae5d3783f4dd2972a892123d9a9ff90be32db20b0dc8aa6  ffmpeg-2.8.3.tar.bz2
+8324bd3e154c151e64df36afd1edf05b8dc2dcd8e520208be0355a34b4209ad5  fix-flv-extradata.patch"
+sha512sums="2a46bef5ac99d114be7d3ece561ae71d09b87eaecba5da3c02ff1fe7e5cf4913e1b6feecca405540d1d70f9126591c209055edd7df1ad1d8bbf02f107701929e  ffmpeg-2.8.5.tar.bz2
 d9bb652093b1c2d03cead78bcafd59fc8305f36fe5359ac5d7caf038889f1239829e288c07e77a11bbef89de5fe54a5eae50a1c4718ec77137bb677ef9069e54  configure-dlvsym.patch
-d4d369055ef9ec8742f971786b05b89a5748a32cee711f623b71e8aea54b004bebda4e618017a351162647360632b13bcc7f09059938734e692ec841fe769c46  fix-flv-extradata.patch
-29b669fd4069841b274392a382f07505c60f2ca37eea8b441609d48b7ea79e80f5396cbcb00763dfc076729287b4c0d4497eb6aa1c350f1d9574095ecb2351c0  fix-mpegtsenc-cbr-scaling.patch"
+d4d369055ef9ec8742f971786b05b89a5748a32cee711f623b71e8aea54b004bebda4e618017a351162647360632b13bcc7f09059938734e692ec841fe769c46  fix-flv-extradata.patch"

main/ffmpeg/fix-mpegtsenc-cbr-scaling.patch

-diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
-index 468bad4..8c0987c 100644
---- a/libavformat/mpegtsenc.c
-+++ b/libavformat/mpegtsenc.c
-@@ -852,12 +852,9 @@ static int mpegts_write_header(AVFormatContext *s)
-         ts_st = pcr_st->priv_data;
- 
-     if (ts->mux_rate > 1) {
--        service->pcr_packet_period = (ts->mux_rate * ts->pcr_period) /
--                                     (TS_PACKET_SIZE * 8 * 1000);
--        ts->sdt_packet_period      = (ts->mux_rate * SDT_RETRANS_TIME) /
--                                     (TS_PACKET_SIZE * 8 * 1000);
--        ts->pat_packet_period      = (ts->mux_rate * PAT_RETRANS_TIME) /
--                                     (TS_PACKET_SIZE * 8 * 1000);
-+        service->pcr_packet_period = av_rescale(ts->pcr_period,   ts->mux_rate, TS_PACKET_SIZE * 8 * 1000);
-+        ts->sdt_packet_period      = av_rescale(SDT_RETRANS_TIME, ts->mux_rate, TS_PACKET_SIZE * 8 * 1000);
-+        ts->pat_packet_period      = av_rescale(PAT_RETRANS_TIME, ts->mux_rate, TS_PACKET_SIZE * 8 * 1000);
- 
-         if (ts->copyts < 1)
-             ts->first_pcr = av_rescale(s->max_delay, PCR_TIME_BASE, AV_TIME_BASE);