virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

move ff_get_bmp_header under CONFIG_DEMUXERS block

Browse Source 
Originally committed as revision 26182 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Peter Ross
2011-01-01 03:24:10 +00:00
parent 9c84a72a25
commit 773d892a31
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libavformat/riff.c
View File

@@ -444,23 +444,6 @@ int ff_put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
return hdrsize; return hdrsize;
} }
int ff_get_bmp_header(ByteIOContext *pb, AVStream *st)
{
int tag1;
get_le32(pb); /* size */
st->codec->width = get_le32(pb);
st->codec->height = (int32_t)get_le32(pb);
get_le16(pb); /* planes */
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 */
return tag1;
}
/* BITMAPINFOHEADER header */ /* BITMAPINFOHEADER header */
void ff_put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf) void ff_put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf)
{ {
@@ -555,6 +538,23 @@ enum CodecID ff_wav_codec_get_id(unsigned int tag, int bps)
id = CODEC_ID_PCM_ZORK; id = CODEC_ID_PCM_ZORK;
return id; return id;
} }
int ff_get_bmp_header(ByteIOContext *pb, AVStream *st)
{
int tag1;
get_le32(pb); /* size */
st->codec->width = get_le32(pb);
st->codec->height = (int32_t)get_le32(pb);
get_le16(pb); /* planes */
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 */
return tag1;
}
#endif // CONFIG_DEMUXERS #endif // CONFIG_DEMUXERS
void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale) void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale)