[FFmpeg-cvslog] Merge commit '525f58977c93e189fda49a5c4928feaf4d89fac6'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Sep 16 11:23:20 2015 +0200| [b3ff8ef6ec239085f41ee3b0b68d7ac0a4142226] | committer: Hendrik Leppkes

Merge commit '525f58977c93e189fda49a5c4928feaf4d89fac6'

* commit '525f58977c93e189fda49a5c4928feaf4d89fac6':
  mpegvideo: Move macros to more appropriate headers

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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