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/dnxhdenc.c | |
| parent | d9c23a0d5a56488b146eef17a19a9b47643be333 (diff) | |
| parent | 1f6f58d5855288492fc2640a9f1035c01c75d356 (diff) | |
| download | ffmpeg-faba79e0800ded6285e2cf75622fa42077e781f4.tar.gz | |
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/dnxhdenc.c')
| -rw-r--r-- | libavcodec/dnxhdenc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index c1f06f28ea..d6506a2c7f 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -993,13 +993,13 @@ static int dnxhd_encode_end(AVCodecContext *avctx) } AVCodec ff_dnxhd_encoder = { - "dnxhd", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_DNXHD, - sizeof(DNXHDEncContext), - dnxhd_encode_init, - dnxhd_encode_picture, - dnxhd_encode_end, + .name = "dnxhd", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_DNXHD, + .priv_data_size = sizeof(DNXHDEncContext), + .init = dnxhd_encode_init, + .encode = dnxhd_encode_picture, + .close = dnxhd_encode_end, .capabilities = CODEC_CAP_SLICE_THREADS, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_YUV422P10, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), |