virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-06 06:27:36 +02:00
Code Issues Releases Activity

iff demuxer: don't bother checking bitmap compression type; iff decoder does this now

Browse Source 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Peter Ross
2012-11-22 20:42:37 +11:00
parent f737e76026
commit 76f60788e7
1 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/iff.c
View File

@ -85,17 +85,12 @@ typedef enum {
COMP_EXP COMP_EXP
} svx8_compression_type; } svx8_compression_type;
typedef enum {
BITMAP_RAW,
BITMAP_BYTERUN1
} bitmap_compression_type;
typedef struct { typedef struct {
uint64_t body_pos; uint64_t body_pos;
uint32_t body_size; uint32_t body_size;
uint32_t sent_bytes; uint32_t sent_bytes;
svx8_compression_type svx8_compression; svx8_compression_type svx8_compression;
bitmap_compression_type bitmap_compression; ///< delta compression method used unsigned bitmap_compression; ///< delta compression method used
unsigned bpp; ///< bits per plane to decode (differs from bits_per_coded_sample if HAM) unsigned bpp; ///< bits per plane to decode (differs from bits_per_coded_sample if HAM)
unsigned ham; ///< 0 if non-HAM or number of hold bits (6 for bpp > 6, 4 otherwise) unsigned ham; ///< 0 if non-HAM or number of hold bits (6 for bpp > 6, 4 otherwise)
unsigned flags; ///< 1 for EHB, 0 is no extra half darkening unsigned flags; ///< 1 for EHB, 0 is no extra half darkening
@ -272,11 +267,6 @@ static int iff_read_header(AVFormatContext *s)
st->codec->width = avio_rb16(pb); st->codec->width = avio_rb16(pb);
st->codec->height = avio_rb16(pb); st->codec->height = avio_rb16(pb);
iff->bitmap_compression = avio_rb16(pb); iff->bitmap_compression = avio_rb16(pb);
if (iff->bitmap_compression > 1) {
av_log(s, AV_LOG_ERROR,
"compression %i not supported\n", iff->bitmap_compression);
return AVERROR_PATCHWELCOME;
}
st->sample_aspect_ratio.num = avio_r8(pb); st->sample_aspect_ratio.num = avio_r8(pb);
st->sample_aspect_ratio.den = avio_r8(pb); st->sample_aspect_ratio.den = avio_r8(pb);
st->codec->bits_per_coded_sample = 24; st->codec->bits_per_coded_sample = 24;
@ -356,19 +346,7 @@ static int iff_read_header(AVFormatContext *s)
bytestream_put_byte(&buf, iff->flags); bytestream_put_byte(&buf, iff->flags);
bytestream_put_be16(&buf, iff->transparency); bytestream_put_be16(&buf, iff->transparency);
bytestream_put_byte(&buf, iff->masking); bytestream_put_byte(&buf, iff->masking);
st->codec->codec_id = AV_CODEC_ID_IFF_ILBM;
switch (iff->bitmap_compression) {
case BITMAP_RAW:
st->codec->codec_id = AV_CODEC_ID_IFF_ILBM;
break;
case BITMAP_BYTERUN1:
st->codec->codec_id = AV_CODEC_ID_IFF_BYTERUN1;
break;
default:
av_log(s, AV_LOG_ERROR,
"Unknown bitmap compression method '%d'\n", iff->bitmap_compression);
return AVERROR_INVALIDDATA;
}
break; break;
default: default:
return -1; return -1;