Merge commit '6ef96292d99302a59f824713fc763f6abd3754df'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:37:49 +0000 (18:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:38:39 +0000 (18:38 +0200)
commitc1bc20bfd9f6ab2d2a3342a924938185404d7a4f
treeb1216104b2e67e945ee9119c241e72f6cda05cc1
parent6ca0a976b2e68c9aa36d2e0806d31eee66d9f482
parent6ef96292d99302a59f824713fc763f6abd3754df
Merge commit '6ef96292d99302a59f824713fc763f6abd3754df'

* commit '6ef96292d99302a59f824713fc763f6abd3754df':
  utils: add yvyu422 to avcodec_align_dimensions2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c