diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2009-03-22 07:40:22 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2009-03-22 07:40:22 +0000 |
| commit | c21fbefb9d55b727ba04892d3c9238462d2d3f35 (patch) | |
| tree | a91a3f09d08f9d71fe22df3f4350c8e7b549fba6 | |
| parent | 5c5776e10de4573ebd5557aca04421dbd836791d (diff) | |
| download | ffmpeg-c21fbefb9d55b727ba04892d3c9238462d2d3f35.tar.gz | |
Add AURA 1 and 2 codec IDs and register their FOURCCs
Originally committed as revision 18141 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavformat/riff.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index cdc88b41b0..6ad0861ab8 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -191,6 +191,8 @@ enum CodecID { CODEC_ID_TGV, CODEC_ID_TGQ, CODEC_ID_TQI, + CODEC_ID_AURA, + CODEC_ID_AURA2, /* various PCM "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, diff --git a/libavformat/riff.c b/libavformat/riff.c index f4606d4eec..c0bccb9737 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -202,6 +202,8 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_RPZA, MKTAG('R', 'P', 'Z', 'A') }, { CODEC_ID_RPZA, MKTAG('r', 'p', 'z', 'a') }, { CODEC_ID_SP5X, MKTAG('S', 'P', '5', '4') }, + { CODEC_ID_AURA, MKTAG('A', 'U', 'R', 'A') }, + { CODEC_ID_AURA2, MKTAG('A', 'U', 'R', '2') }, { CODEC_ID_NONE, 0 } }; |