Merge commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:52:01 +0000 (01:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:57:29 +0000 (01:57 +0200)
commit73e150fff735d99193b2ebef902625d6ee4c8209
tree9f19f64611876de567d506bf17cdcf2e285df8cc
parent10531d48a0f91aea57eac7e1c6cf5857e601826e
parent7d2a6826912b629f17f3b0c5268e334fa123c4c9
Merge commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9'

* commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9':
  huffyuv: Check memory allocation

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