diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 01:10:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 01:10:28 +0100 |
| commit | 12ab07be447264b107b18bc49bb9e06be072330f (patch) | |
| tree | 7efd220c82eba3dc7779839806ac5c1b080aa520 /libavcodec/codec_desc.c | |
| parent | 61b5ef7754132c43e6db1a273066e82c469fa39c (diff) | |
| parent | e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b (diff) | |
| download | ffmpeg-12ab07be447264b107b18bc49bb9e06be072330f.tar.gz | |
Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b':
Alias PIX image encoder and decoder
Conflicts:
Changelog
libavcodec/allcodecs.c
libavcodec/version.h
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 8f0b8077b2..057c8af7e0 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1251,6 +1251,13 @@ static const AVCodecDescriptor codec_descriptors[] = { /* image codecs */ { + .id = AV_CODEC_ID_ALIAS_PIX, + .type = AVMEDIA_TYPE_VIDEO, + .name = "alias_pix", + .long_name = NULL_IF_CONFIG_SMALL("Alias/Wavefront PIX image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { .id = AV_CODEC_ID_ANSI, .type = AVMEDIA_TYPE_VIDEO, .name = "ansi", |