3 --- cinelerra/ffmpeg.C.orig 2010-01-29 07:15:28.000000000 +0000
10 +#include <libswscale/swscale.h>
14 @@ -69,12 +69,10 @@ CodecID FFMPEG::codec_id(char *codec_str
15 PixelFormat FFMPEG::color_model_to_pix_fmt(int color_model) {
19 - return PIX_FMT_YUV422;
22 case BC_BGR8888: // NOTE: order flipped
23 - return PIX_FMT_RGBA32;
24 + return PIX_FMT_RGBA;
28 @@ -95,11 +93,9 @@ PixelFormat FFMPEG::color_model_to_pix_f
29 int FFMPEG::pix_fmt_to_color_model(PixelFormat pix_fmt) {
32 - case PIX_FMT_YUV422:
36 - case PIX_FMT_RGBA32:
41 @@ -286,7 +282,7 @@ int FFMPEG::convert_cmodel(AVPicture *pi
42 // make an intermediate temp frame only if necessary
43 int cmodel_in = pix_fmt_to_color_model(pix_fmt_in);
44 if (cmodel_in == BC_TRANSPARENCY) {
45 - if (pix_fmt_in == PIX_FMT_RGBA32) {
46 + if (pix_fmt_in == PIX_FMT_RGBA) {
47 // avoid infinite recursion if things are broken
48 printf("FFMPEG::convert_cmodel pix_fmt_in broken!\n");