diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 21:12:57 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 21:26:46 +0400 |
| commit | e37dbfddda0380fd9ea9ba1bbae8a5ab2afc6573 (patch) | |
| tree | 6d466e4b5f4f4e661031f14453a62ab2b86d0776 /Changelog | |
| parent | 928b5708f94c50e8cb0b982208a2d097b0d588c2 (diff) | |
| parent | 07761294fc3f08e139e8a406ef7d5b63aaf1ecee (diff) | |
Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'
* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
Silicon Graphics RLE 8-bit video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/sgirledec.c
libavcodec/version.h
See: afa1617b937f3675f74c6351a46c45f8c24d67f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
| -rw-r--r-- | Changelog | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -236,7 +236,7 @@ version 1.1: - JSON captions for TED talks decoding support - SOX Resampler support in libswresample - aselect filter -- SGI RLE 8-bit decoder +- SGI RLE 8-bit / Silicon Graphics RLE 8-bit video decoder - Silicon Graphics Motion Video Compressor 1 & 2 decoder - Silicon Graphics Movie demuxer - apad filter |