This fixes MKV issues and build issues :)

(cherry picked from commit 68225947)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Alexandre Perraud authored Jul 22, 2016 and Jean-Baptiste Kempf committed Jul 22, 2016

(cherry picked from commit ac3bd861)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Not used for now, and this doesn't allow to get the size of a stream.

This reverts commit 8c3c7a34 and partially
0f135d64

assets should be copied before merging.

(cherry picked from commit cac5f75d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Thomas Guillem authored Jul 12, 2016 and Jean-Baptiste Kempf committed Jul 16, 2016

(cherry picked from commit 4f6f5e01)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Geoffrey Métais authored Jul 07, 2016 and Jean-Baptiste Kempf committed Jul 16, 2016

(cherry picked from commit 4b250c75)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 21603a2a)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit c17960c4)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 586a2b54)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 26fc2f9b)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit c3a93473)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit e4da531f)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit b1cc83d8)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit b93e67bd)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 532d1613)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 3ed694cd)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 6fd32a10)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 8fd8c6c7)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 0289aadd)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 12a25a3e)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 818f65a2)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit e4fce1f1)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit dc2d89ec)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit bcecb846)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit a428e176)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 9fb1b15d)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 09b62ad7)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit f674614f)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit f42cca0f)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 4f9a5469)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 23b44d9f)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 8e86e153)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 1d49dd29)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 3507334e)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 09c97411)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit eb44b441)

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
(cherry picked from commit 7c8cdf35)