[FFmpeg-cvslog] Merge commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 19 21:40:46 2013 +0200| [a8b05dde0d88a4f654fb9ab1d6b7bcb0b65f2c78] | committer: Michael Niedermayer

Merge commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72'

* commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72':
  ff_get_buffer(): allocate the frame for max(coded,display) dimensions

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

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