diff options
author | Stephan Hilb <stephan@ecshi.net> | 2012-08-23 18:40:22 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 00:24:11 +0200 |
commit | 6eac554659b6b6e9b348ec26c44b5105a3f4b11c (patch) | |
tree | a2a723ff2606b5bc72e02f40c21e30062e14ca9e /libavcodec/codec_desc.c | |
parent | 469f8b1dcbacc921555af6c068db28ad3d3e5006 (diff) | |
download | ffmpeg-streaming-6eac554659b6b6e9b348ec26c44b5105a3f4b11c.zip ffmpeg-streaming-6eac554659b6b6e9b348ec26c44b5105a3f4b11c.tar.gz |
Add CPiA video decoder
The cpia video decoder is intended to be used with the v4l2 demuxer.
There are some small changes to the v4l2 demuxer to support the
variable frame length of the format.
Fixes ticket #1537
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/codec_desc.c')
-rw-r--r-- | libavcodec/codec_desc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 0385f9c..c4bf433 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1183,6 +1183,12 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "avrn", .long_name = NULL_IF_CONFIG_SMALL("Avid AVI Codec"), }, + { + .id = AV_CODEC_ID_CPIA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cpia", + .long_name = NULL_IF_CONFIG_SMALL("CPiA video format"), + }, /* various PCM "codecs" */ { |