[FFmpeg-cvslog] Merge commit '2beba58e0e4bda688bf96e12413231607ceafdd4'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Dec 27 21:05:11 2017 -0300| [aa6f43c2e959a960792f76d006b8699d733f258f] | committer: James Almer

Merge commit '2beba58e0e4bda688bf96e12413231607ceafdd4'

* commit '2beba58e0e4bda688bf96e12413231607ceafdd4':
  mmaldec: Fix compilation after 2fcb0090

This commit is a noop, see 758fbc54fef2f31957b5c5f22e05e5fd9b04f631

Merged-by: James Almer <jamrial at gmail.com>

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