Merge commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:18:47 +0000 (13:18 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:18:47 +0000 (13:18 +0200)
commitc824c3c47ca656b332f08b9e2b06d1ff61af1141
treec7935a49e278d54c782d394617f40808791fae05
parent5ffbfe38a5d1cacac15187c5f8828c1dc18eb9f4
parentd52208e8d549d4c84a2a348aa3790b1a177e779a
Merge commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a'

* commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a':
  mmaldec: Add mpeg2 decoding support

This commit is a noop, see 7ebe12fc55591053cbd194ca6638e5c32beaee45

Merged-by: Clément Bœsch <clement@stupeflix.com>