Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 01:55:45 +0000 (03:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 01:55:45 +0000 (03:55 +0200)
commit5628b9f5fb92a72fa35a46520cf6c4dc1942de25
tree047513d7fd38a7a53db2b302ed9499346cff45d0
parent5b03caf9491d3f4a1ddbb5e1c9e7e619c4390af5
parentab7c64624a1254d509b71c2a4945336567e93845
Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'

* commit 'ab7c64624a1254d509b71c2a4945336567e93845':
  sgi: remove redundant argument from read_uncompressed_sgi()

Conflicts:
libavcodec/sgidec.c

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