Merge commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 03:08:01 +0000 (05:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 03:29:55 +0000 (05:29 +0200)
commit2793b218bdd59db51f1f5c960c508fea7190310e
tree1f71ca2c450d848ce588fe240e4d432231d73c92
parentd5fde13bd226574714d7e30e6442b27f782017a6
parentd0393d79bc3d61c9f2ff832c0e273b7774ff0269
Merge commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269'

* commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269':
  huffyuv: Check and propagate function return values

Conflicts:
libavcodec/huffyuvdec.c

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