Commit 7ccff155 authored by michael's avatar michael

CODEC_ID_CAVS (part of the cavs patch by Stefan Gehrer stefan.gehrer gmx de)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5579 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 6ba95328
...@@ -118,6 +118,7 @@ enum CodecID { ...@@ -118,6 +118,7 @@ enum CodecID {
CODEC_ID_NUV, CODEC_ID_NUV,
CODEC_ID_KMVC, CODEC_ID_KMVC,
CODEC_ID_FLASHSV, CODEC_ID_FLASHSV,
CODEC_ID_CAVS,
/* various pcm "codecs" */ /* various pcm "codecs" */
CODEC_ID_PCM_S16LE= 0x10000, CODEC_ID_PCM_S16LE= 0x10000,
...@@ -2271,6 +2272,7 @@ extern AVCodec smacker_decoder; ...@@ -2271,6 +2272,7 @@ extern AVCodec smacker_decoder;
extern AVCodec smackaud_decoder; extern AVCodec smackaud_decoder;
extern AVCodec kmvc_decoder; extern AVCodec kmvc_decoder;
extern AVCodec flashsv_decoder; extern AVCodec flashsv_decoder;
extern AVCodec cavs_decoder;
/* pcm codecs */ /* pcm codecs */
#define PCM_CODEC(id, name) \ #define PCM_CODEC(id, name) \
...@@ -2557,6 +2559,7 @@ void av_parser_close(AVCodecParserContext *s); ...@@ -2557,6 +2559,7 @@ void av_parser_close(AVCodecParserContext *s);
extern AVCodecParser mpegvideo_parser; extern AVCodecParser mpegvideo_parser;
extern AVCodecParser mpeg4video_parser; extern AVCodecParser mpeg4video_parser;
extern AVCodecParser cavsvideo_parser;
extern AVCodecParser h261_parser; extern AVCodecParser h261_parser;
extern AVCodecParser h263_parser; extern AVCodecParser h263_parser;
extern AVCodecParser h264_parser; extern AVCodecParser h264_parser;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment