Merge commit '43d676432740c6d5e5234ed343f13902909fd124' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 12:38:20 +0000 (14:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 12:38:20 +0000 (14:38 +0200)
commit451bc8ee2fceaf9a3290ed5a6c65b6734ab51b8c
tree6aba32ee6ccdfb275f6ab0b1866fa3e211eaf649
parentae7ea2eabf35a28be592b45719e7bd4f7ca4b622
parent43d676432740c6d5e5234ed343f13902909fd124
Merge commit '43d676432740c6d5e5234ed343f13902909fd124' into release/1.1

* commit '43d676432740c6d5e5234ed343f13902909fd124':
  huffyuv: Check and propagate function return values

Conflicts:
libavcodec/huffyuvdec.c

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