Commit 32282b50 authored by Jason Garrett-Glaser's avatar Jason Garrett-Glaser

Add .pix_fmts to LCL encoder

Now ffmpeg should automatically convert to BGR instead of erroring out.

Originally committed as revision 26178 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0790caba
...@@ -130,16 +130,8 @@ static av_cold int encode_init(AVCodecContext *avctx) ...@@ -130,16 +130,8 @@ static av_cold int encode_init(AVCodecContext *avctx)
// Will be user settable someday // Will be user settable someday
c->compression = 6; c->compression = 6;
c->flags = 0; c->flags = 0;
c->imgtype = IMGTYPE_RGB24;
switch(avctx->pix_fmt){ avctx->bits_per_coded_sample= 24;
case PIX_FMT_BGR24:
c->imgtype = IMGTYPE_RGB24;
avctx->bits_per_coded_sample= 24;
break;
default:
av_log(avctx, AV_LOG_ERROR, "Input pixel format %s not supported\n", avcodec_get_pix_fmt_name(avctx->pix_fmt));
return -1;
}
avctx->extradata[0]= 4; avctx->extradata[0]= 4;
avctx->extradata[1]= 0; avctx->extradata[1]= 0;
...@@ -186,5 +178,6 @@ AVCodec zlib_encoder = { ...@@ -186,5 +178,6 @@ AVCodec zlib_encoder = {
encode_init, encode_init,
encode_frame, encode_frame,
encode_end, encode_end,
.pix_fmts = (const enum PixelFormat[]) { PIX_FMT_BGR24, PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"),
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment