Merge commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:58:37 +0000 (19:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:58:37 +0000 (19:58 +0200)
* commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936':
  huffyuv: Check and propagate function return values

Conflicts:
libavcodec/huffyuv.c

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

Simple merge