[FFmpeg-cvslog] Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 27 13:25:52 2014 +0100| [a6ab9ed50d8a5b749f3e0a670e4fd6ee52d92b94] | committer: Michael Niedermayer

Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec'

* commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec':
  avconv_vdpau: allocate video surface of VDPAU-specified size

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

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