diff options
| author | ami_stuff <ami_stuff@o2.pl> | 2011-11-21 20:31:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-21 23:06:53 +0100 |
| commit | cf14c822275301209c307fb35351d5c9833b7a3b (patch) | |
| tree | 644fe2d4a1211d489f5e70ab3c042ccd25c281ea /libavformat | |
| parent | 7f6a0190963f99c9b90dc58f17f8d450d2a4f98e (diff) | |
| download | ffmpeg-cf14c822275301209c307fb35351d5c9833b7a3b.tar.gz | |
[PATCH] IFF Amiga Continuous Bitmap (ACBM)decoder
Some sample IFF ACBM files can be found here:
http://aminet.net/package/dev/basic/ABdemos
Thanks to Peter Ross for his help with this patch.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/iff.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/iff.c b/libavformat/iff.c index 7601d6d73b..a816af580b 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -43,6 +43,7 @@ #define ID_BMHD MKTAG('B','M','H','D') #define ID_CAMG MKTAG('C','A','M','G') #define ID_CMAP MKTAG('C','M','A','P') +#define ID_ACBM MKTAG('A','C','B','M') #define ID_FORM MKTAG('F','O','R','M') #define ID_ANNO MKTAG('A','N','N','O') @@ -53,6 +54,7 @@ #define ID_FVER MKTAG('F','V','E','R') #define ID_NAME MKTAG('N','A','M','E') #define ID_TEXT MKTAG('T','E','X','T') +#define ID_ABIT MKTAG('A','B','I','T') #define ID_BODY MKTAG('B','O','D','Y') #define ID_ANNO MKTAG('A','N','N','O') @@ -118,7 +120,7 @@ static int iff_probe(AVProbeData *p) const uint8_t *d = p->buf; if ( AV_RL32(d) == ID_FORM && - (AV_RL32(d+8) == ID_8SVX || AV_RL32(d+8) == ID_PBM || AV_RL32(d+8) == ID_ILBM) ) + (AV_RL32(d+8) == ID_8SVX || AV_RL32(d+8) == ID_PBM || AV_RL32(d+8) == ID_ILBM || AV_RL32(d+8) == ID_ACBM) ) return AVPROBE_SCORE_MAX; return 0; } @@ -166,6 +168,7 @@ static int iff_read_header(AVFormatContext *s, } break; + case ID_ABIT: case ID_BODY: iff->body_pos = avio_tell(pb); iff->body_size = data_size; |