[FFmpeg-cvslog] Merge commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Tue Jun 21 13:18:47 2016 +0200| [c824c3c47ca656b332f08b9e2b06d1ff61af1141] | committer: Clément Bœsch

Merge commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a'

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

This commit is a noop, see 7ebe12fc55591053cbd194ca6638e5c32beaee45

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c824c3c47ca656b332f08b9e2b06d1ff61af1141
---