X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=fb5ef21016313563b27fd5f0fd5e6f6a550121ad;hb=c88e3df2c765bfff605a98f1feed145af81ca238;hp=8673e6f39fb10eb4aba5e3a76456bf2bdd83b3d0;hpb=089f2be86316b88f72a6c359ab10e2b95539005b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 8673e6f3..fb5ef210 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -831,6 +831,9 @@ AVPixelFormat FFVideoConvert::color_model_to_pix_fmt(int color_model)
 	case BC_RGBA8888:	return AV_PIX_FMT_RGBA;
 	case BC_BGR8888:	return AV_PIX_FMT_BGR0;
 	case BC_BGR888:		return AV_PIX_FMT_BGR24;
+	case BC_ARGB8888:	return AV_PIX_FMT_ARGB;
+	case BC_ABGR8888:	return AV_PIX_FMT_ABGR;
+	case BC_RGB8:		return AV_PIX_FMT_RGB8;
 	case BC_YUV420P:	return AV_PIX_FMT_YUV420P;
 	case BC_YUV422P:	return AV_PIX_FMT_YUV422P;
 	case BC_YUV444P:	return AV_PIX_FMT_YUV444P;
@@ -852,6 +855,9 @@ int FFVideoConvert::pix_fmt_to_color_model(AVPixelFormat pix_fmt)
 	case AV_PIX_FMT_RGBA:		return BC_RGBA8888;
 	case AV_PIX_FMT_BGR0:		return BC_BGR8888;
 	case AV_PIX_FMT_BGR24:		return BC_BGR888;
+	case AV_PIX_FMT_ARGB:		return BC_ARGB8888;
+	case AV_PIX_FMT_ABGR:		return BC_ABGR8888;
+	case AV_PIX_FMT_RGB8:		return BC_RGB8;
 	case AV_PIX_FMT_YUV420P:	return BC_YUV420P;
 	case AV_PIX_FMT_YUV422P:	return BC_YUV422P;
 	case AV_PIX_FMT_YUV444P:	return BC_YUV444P;