-
Michael Niedermayer authored
* commit 'ab7c6462': sgi: remove redundant argument from read_uncompressed_sgi() Conflicts: libavcodec/sgidec.c See: 0f656935Merged-by: Michael Niedermayer <michaelni@gmx.at>
5628b9f5
* commit 'ab7c6462': sgi: remove redundant argument from read_uncompressed_sgi() Conflicts: libavcodec/sgidec.c See: 0f656935Merged-by: Michael Niedermayer <michaelni@gmx.at>