diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 13:58:44 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 13:58:44 +0100 |
| commit | 8b3228a329bb38671aee9c4434f2989d149732fe (patch) | |
| tree | e6e60e471a3ff518e7b3d71f63197d44349ce768 /libavcodec/avcodec.h | |
| parent | 8dde5dc05ae2fc4d4a5adc0a718631673b2af0f7 (diff) | |
| parent | 533a6198505edd1379e1cd722852350ae4a85acc (diff) | |
| download | ffmpeg-8b3228a329bb38671aee9c4434f2989d149732fe.tar.gz | |
Merge commit '533a6198505edd1379e1cd722852350ae4a85acc'
* commit '533a6198505edd1379e1cd722852350ae4a85acc':
innoHeim/Rsupport Screen Capture Codec 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 9a88de8ffe..9099093531 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -297,6 +297,7 @@ enum AVCodecID { AV_CODEC_ID_DDS, AV_CODEC_ID_DXV, AV_CODEC_ID_SCREENPRESSO, + AV_CODEC_ID_RSCC, AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_AVRP, |