diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 04:19:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 04:19:27 +0200 |
| commit | 767b1daf4b6a40e34ebe2a18f328074babfd8bd1 (patch) | |
| tree | c117d62cbdb3552a102945c200392943d0c0fc81 /libavformat/ffmetadec.c | |
| parent | 4ebfcd62af117ed7f343a0e52709a6409e0913f4 (diff) | |
| parent | d613091f8858d87789916e2bd7a84ea3144077d4 (diff) | |
| download | ffmpeg-767b1daf4b6a40e34ebe2a18f328074babfd8bd1.tar.gz | |
Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'
* commit 'd613091f8858d87789916e2bd7a84ea3144077d4':
sgi: decode 16bit RLE images
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmetadec.c')
0 files changed, 0 insertions, 0 deletions