From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Sun, 4 Dec 2011 13:20:49 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.2~21
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=ee7e15866b42698cb54f35af5a9fa2ccdfe0ae65

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1778 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
---

diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index 243fee8dc..ff6cd8abb 100644
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -75,6 +75,13 @@ static int query_formats_420(AVFilterContext *ctx)
     return 0;
 }
 
+static int query_formats_411(AVFilterContext *ctx)
+{
+    static const int pix_fmts[] = {PIX_FMT_YUV411P, PIX_FMT_NONE};
+    avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));
+    return 0;
+}
+
 struct filter::implementation
 {
 	std::string						filters_;
@@ -166,6 +173,10 @@ struct filter::implementation
 						{
 							if(frame->format == PIX_FMT_UYVY422)
 								graph_->filters[n]->filter->query_formats = query_formats_422;
+							if(frame->format == PIX_FMT_YUYV422)
+								graph_->filters[n]->filter->query_formats = query_formats_422;
+							if(frame->format == PIX_FMT_UYYVYY411)
+								graph_->filters[n]->filter->query_formats = query_formats_411;
 							else if(frame->format == PIX_FMT_YUV420P10)
 								graph_->filters[n]->filter->query_formats = query_formats_420;
 							else if(frame->format == PIX_FMT_YUV422P10)
diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index 43e48d9cc..8a46f65eb 100644
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -194,6 +194,10 @@ safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVF
 
 		if(pix_fmt == PIX_FMT_UYVY422)
 			target_pix_fmt = PIX_FMT_YUV422P;
+		else if(pix_fmt == PIX_FMT_YUYV422)
+			target_pix_fmt = PIX_FMT_YUV422P;
+		else if(pix_fmt == PIX_FMT_UYYVYY411)
+			target_pix_fmt = PIX_FMT_YUV411P;
 		else if(pix_fmt == PIX_FMT_YUV420P10)
 			target_pix_fmt = PIX_FMT_YUV420P;
 		else if(pix_fmt == PIX_FMT_YUV422P10)