Merge commit '9a4aaae3b29392b6d74997e06be249d7d54a7394'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 04:35:00 +0000 (05:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 04:45:48 +0000 (05:45 +0100)
* commit '9a4aaae3b29392b6d74997e06be249d7d54a7394':
  lavc: add GBRAP to avcodec_align_dimensions2

See: 5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/utils.c

Simple merge