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/avcodec.h | |
| parent | 9825a24e5b1c34663d672961ebd2561a009b23e9 (diff) | |
| parent | 9a3202a98b2e095b54dd784c3e01a09a676fc3fa (diff) | |
| download | ffmpeg-4d2160c99a00af98cb09749f24831580e816eda9.tar.gz | |
Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa'
* commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa':
Screenpresso SPV1 decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 138627d8d4..ff70d254af 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -296,6 +296,7 @@ enum AVCodecID { AV_CODEC_ID_HAP, AV_CODEC_ID_DDS, AV_CODEC_ID_DXV, + AV_CODEC_ID_SCREENPRESSO, AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_AVRP, |