diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 12:22:41 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 12:22:41 +0200 |
| commit | 4d2160c99a00af98cb09749f24831580e816eda9 (patch) | |
| tree | cf897382bd18d139b6533f2fd889e25eee6eafbd /libavcodec/allcodecs.c | |
| parent | 9825a24e5b1c34663d672961ebd2561a009b23e9 (diff) | |
| parent | 9a3202a98b2e095b54dd784c3e01a09a676fc3fa (diff) | |
Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa'
* commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa':
Screenpresso SPV1 decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index f33e457ce2..3870cf6f12 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -285,6 +285,7 @@ void avcodec_register_all(void) REGISTER_DECODER(RV40, rv40); REGISTER_ENCDEC (S302M, s302m); REGISTER_DECODER(SANM, sanm); + REGISTER_DECODER(SCREENPRESSO, screenpresso); REGISTER_ENCDEC (SGI, sgi); REGISTER_DECODER(SGIRLE, sgirle); REGISTER_DECODER(SMACKER, smacker); |