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)
* commit '6ef96292d99302a59f824713fc763f6abd3754df':
  utils: add yvyu422 to avcodec_align_dimensions2

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

Simple merge