Merge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 07:50:26 +0000 (09:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 07:50:26 +0000 (09:50 +0200)
commit947f2d4d34f29a8bc51fd4a97718b1c163d7a55d
treecce68e10d61b9d8fe6b2ee7e4d165d6a438f8abb
parent6df20d0d350793b89c3ff541cf453ae69cf99beb
parent55c4cba2a7037161ea56b2d55b347c8381df7f1e
Merge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e'

* commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e':
  huffyuvenc: BGRA support

Conflicts:
libavcodec/huffyuvenc.c

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