Merge commit '744b406ff3474e77543bcf86125a2f7bc7deaa18' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 02:04:01 +0000 (04:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 02:04:01 +0000 (04:04 +0200)
commit9ed1aa0465b3377dec860bcfe8144533b9ea9d68
tree46fb8a64128d22cc7339682a3d9516ed6ea2c908
parent188ce941ec01c3292609055d338ec51525e07b34
parent744b406ff3474e77543bcf86125a2f7bc7deaa18
Merge commit '744b406ff3474e77543bcf86125a2f7bc7deaa18' into release/2.2

* commit '744b406ff3474e77543bcf86125a2f7bc7deaa18':
  huffyuv: Check and propagate function return values

Conflicts:
libavcodec/huffyuvdec.c

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