diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 05:55:45 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 05:55:45 +0400 |
| commit | 5628b9f5fb92a72fa35a46520cf6c4dc1942de25 (patch) | |
| tree | 047513d7fd38a7a53db2b302ed9499346cff45d0 /Changelog | |
| parent | 5b03caf9491d3f4a1ddbb5e1c9e7e619c4390af5 (diff) | |
| parent | ab7c64624a1254d509b71c2a4945336567e93845 (diff) | |
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>
Diffstat (limited to 'Changelog')
0 files changed, 0 insertions, 0 deletions