diff options
| author | Peter Ross <pross@xvid.org> | 2010-12-26 01:23:44 +0000 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2010-12-26 01:23:44 +0000 |
| commit | 456a70aeb826b7b84d30cc3cc279fa7c65fc7d4e (patch) | |
| tree | ac69b659056201d3c9b68aca8c8228524c26ce77 /libavformat/avidec.c | |
| parent | 52654005caa343e9d17c0776d05825f1d771f448 (diff) | |
| download | ffmpeg-456a70aeb826b7b84d30cc3cc279fa7c65fc7d4e.tar.gz | |
add ff_get_bmp_header
Originally committed as revision 26091 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index d31af67620..15f48e8ac7 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -570,17 +570,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) url_fskip(pb, size); break; } - get_le32(pb); /* size */ - st->codec->width = get_le32(pb); - st->codec->height = (int32_t)get_le32(pb); - get_le16(pb); /* panes */ - st->codec->bits_per_coded_sample= get_le16(pb); /* depth */ - tag1 = get_le32(pb); - get_le32(pb); /* ImageSize */ - get_le32(pb); /* XPelsPerMeter */ - get_le32(pb); /* YPelsPerMeter */ - get_le32(pb); /* ClrUsed */ - get_le32(pb); /* ClrImportant */ + tag1 = ff_get_bmp_header(pb, st); if (tag1 == MKTAG('D', 'X', 'S', 'B') || tag1 == MKTAG('D','X','S','A')) { st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; |