git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index 243fee8dcf4278c2b9fd8b5f3dd1c58b8363f1e7..ff6cd8abbfd0f9fb0c3f9b56b2ecdef4dcc4eba2 100644 (file)
--- 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;\r
 }\r
 \r
+static int query_formats_411(AVFilterContext *ctx)\r
+{\r
+    static const int pix_fmts[] = {PIX_FMT_YUV411P, PIX_FMT_NONE};\r
+    avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));\r
+    return 0;\r
+}\r
+\r
 struct filter::implementation\r
 {\r
        std::string                                             filters_;\r
@@ -166,6 +173,10 @@ struct filter::implementation
                                                {\r
                                                        if(frame->format == PIX_FMT_UYVY422)\r
                                                                graph_->filters[n]->filter->query_formats = query_formats_422;\r
+                                                       if(frame->format == PIX_FMT_YUYV422)\r
+                                                               graph_->filters[n]->filter->query_formats = query_formats_422;\r
+                                                       if(frame->format == PIX_FMT_UYYVYY411)\r
+                                                               graph_->filters[n]->filter->query_formats = query_formats_411;\r
                                                        else if(frame->format == PIX_FMT_YUV420P10)\r
                                                                graph_->filters[n]->filter->query_formats = query_formats_420;\r
                                                        else if(frame->format == PIX_FMT_YUV422P10)\r

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index 43e48d9ccdb56646faf8fb028c39ce7c3198b129..8a46f65ebc6be9c18c9ff1a2e7dee665e8bd68bc 100644 (file)
--- 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
 \r
                if(pix_fmt == PIX_FMT_UYVY422)\r
                        target_pix_fmt = PIX_FMT_YUV422P;\r
+               else if(pix_fmt == PIX_FMT_YUYV422)\r
+                       target_pix_fmt = PIX_FMT_YUV422P;\r
+               else if(pix_fmt == PIX_FMT_UYYVYY411)\r
+                       target_pix_fmt = PIX_FMT_YUV411P;\r
                else if(pix_fmt == PIX_FMT_YUV420P10)\r
                        target_pix_fmt = PIX_FMT_YUV420P;\r
                else if(pix_fmt == PIX_FMT_YUV422P10)\r