diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-30 06:39:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-30 06:46:08 +0200 |
| commit | faba79e0800ded6285e2cf75622fa42077e781f4 (patch) | |
| tree | cc57a187242b52fcde696caf65571b411ab5d392 /libavcodec/bmpenc.c | |
| parent | d9c23a0d5a56488b146eef17a19a9b47643be333 (diff) | |
| parent | 1f6f58d5855288492fc2640a9f1035c01c75d356 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
H.264: tweak some other x86 asm for Atom
probe: Fix insane flow control.
mpegts: remove invalid error check
s302m: use nondeprecated audio sample format API
lavc: use designated initialisers for all codecs.
x86: cabac: add operand size suffixes missing from 6c32576
Conflicts:
libavcodec/ac3enc_float.c
libavcodec/flacenc.c
libavcodec/frwu.c
libavcodec/pictordec.c
libavcodec/qtrleenc.c
libavcodec/v210enc.c
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmpenc.c')
| -rw-r--r-- | libavcodec/bmpenc.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index 3719a539f5..63c3b729a9 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -150,13 +150,12 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s } AVCodec ff_bmp_encoder = { - "bmp", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_BMP, - sizeof(BMPContext), - bmp_encode_init, - bmp_encode_frame, - NULL, //encode_end, + .name = "bmp", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_BMP, + .priv_data_size = sizeof(BMPContext), + .init = bmp_encode_init, + .encode = bmp_encode_frame, .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_RGB565, |