From 773d892a311475b1082de1d370bc6c7102f169f0 Mon Sep 17 00:00:00 2001
From: Peter Ross <pross@xvid.org>
Date: Sat, 1 Jan 2011 03:24:10 +0000
Subject: [PATCH] move ff_get_bmp_header under CONFIG_DEMUXERS block
Originally committed as revision 26182 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/riff.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 7db1c87513f..551c3041a94 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -444,23 +444,6 @@ int ff_put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
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 */
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;
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
void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale)
--
GitLab