opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 07:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

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
parent d9c23a0d5a 1f6f58d585
commit faba79e080
202 changed files with 1882 additions and 2171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/pcxenc.c
View File

@ -190,13 +190,12 @@ static int pcx_encode_frame(AVCodecContext *avctx,
}
AVCodec ff_pcx_encoder = {
"pcx",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_PCX,
sizeof(PCXContext),
pcx_encode_init,
pcx_encode_frame,
NULL,
.name = "pcx",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_PCX,
.priv_data_size = sizeof(PCXContext),
.init = pcx_encode_init,
.encode = pcx_encode_frame,
.pix_fmts = (const enum PixelFormat[]){
PIX_FMT_RGB24,
PIX_FMT_RGB8, PIX_FMT_BGR8, PIX_FMT_RGB4_BYTE, PIX_FMT_BGR4_BYTE, PIX_FMT_GRAY8, PIX_FMT_PAL8,