Merge commit '58a840e21577a2168843487a98cb2cea44b5a94a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Mar 2015 00:01:30 +0000 (01:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Mar 2015 00:09:35 +0000 (01:09 +0100)
* commit '58a840e21577a2168843487a98cb2cea44b5a94a':
  Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat

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

Simple merge