[FFmpeg-cvslog] Merge commit '9a4aaae3b29392b6d74997e06be249d7d54a7394'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 15 05:35:00 2015 +0100| [5edbd4f4106fcff571c3f2c5a1f89534b5bd0307] | committer: Michael Niedermayer

Merge commit '9a4aaae3b29392b6d74997e06be249d7d54a7394'

* commit '9a4aaae3b29392b6d74997e06be249d7d54a7394':
  lavc: add GBRAP to avcodec_align_dimensions2

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

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