wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qatar/master'

Browse source 
* 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>
This commit is contained in:
Michael Niedermayer 2011-07-30 06:39:57 +02:00
commit faba79e080
202 changed files with 1882 additions and 2171 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libavcodec/cdgraphics.c
View file

@ -368,14 +368,13 @@ static av_cold int cdg_decode_end(AVCodecContext *avctx)
}
AVCodec ff_cdgraphics_decoder = {
"cdgraphics",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_CDGRAPHICS,
sizeof(CDGraphicsContext),
cdg_decode_init,
NULL,
cdg_decode_end,
cdg_decode_frame,
CODEC_CAP_DR1,
.name = "cdgraphics",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_CDGRAPHICS,
.priv_data_size = sizeof(CDGraphicsContext),
.init = cdg_decode_init,
.close = cdg_decode_end,
.decode = cdg_decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"),
};