[FFmpeg-cvslog] Merge commit 'c99307caee01441cfde24f3b7b0db3037b7022dc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 03:19:37 2013 +0100| [f1db3f5f593138a9704dc3e4e91871e59289c843] | committer: Michael Niedermayer

Merge commit 'c99307caee01441cfde24f3b7b0db3037b7022dc'

* commit 'c99307caee01441cfde24f3b7b0db3037b7022dc':
  mpegvideo: make frame_size_alloc() static.

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

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