Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 02:19:27 +0000 (04:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 02:19:27 +0000 (04:19 +0200)
commit767b1daf4b6a40e34ebe2a18f328074babfd8bd1
treec117d62cbdb3552a102945c200392943d0c0fc81
parent4ebfcd62af117ed7f343a0e52709a6409e0913f4
parentd613091f8858d87789916e2bd7a84ea3144077d4
Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'

* commit 'd613091f8858d87789916e2bd7a84ea3144077d4':
  sgi: decode 16bit RLE images

Conflicts:
Changelog

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