[FFmpeg-cvslog] Merge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 01:17:03 2015 +0200| [eb5a308d0e75120425c926b25b7141e2e8ea49bd] | committer: Michael Niedermayer

Merge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332'

* commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332':
  mpegvideo: msmpeg4: Move function declarations

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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