[FFmpeg-cvslog] Merge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 01:26:56 2015 +0200| [0aba7192e12bb5e4908c957ee593e0ff3d7f7fe4] | committer: Michael Niedermayer

Merge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2'

* commit 'b2b766914a49c4e3537df3a585e97b98d432edd2':
  mpegvideo: mpeg12: Move function declarations

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

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