[FFmpeg-cvslog] r26091 - in trunk/libavformat: avidec.c riff.c riff.h

[Anton Khirnov]

On Sun, Dec 26, 2010 at 02:23:45AM +0100, pross wrote:
> Author: pross
> Date: Sun Dec 26 02:23:44 2010
> New Revision: 26091
> 
> Log:
> add ff_get_bmp_header
> 
> Modified:
>    trunk/libavformat/avidec.c
>    trunk/libavformat/riff.c
>    trunk/libavformat/riff.h
> 
> Modified: trunk/libavformat/riff.c
> ==============================================================================
> --- trunk/libavformat/riff.c	Sat Dec 25 20:49:19 2010	(r26090)
> +++ trunk/libavformat/riff.c	Sun Dec 26 02:23:44 2010	(r26091)
> @@ -440,6 +440,23 @@ int ff_put_wav_header(ByteIOContext *pb,
>      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;
> +}
> +
I guess it belongs under CONFIG_DEMUXERS, not CONFIG_MUXERS.
Build failure reported by a user in #ffmpeg.

-- 
Anton Khirnov
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20101230/fc9f1e90/attachment.pgp>