diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/cheese-pipeline.c | 12 |
3 files changed, 9 insertions, 5 deletions
@@ -4,6 +4,7 @@ written by daniel g. siegel <dgsiegel@gmail.com> with help from - Jaap Haitsma <jaap@haitsma.org> - Diego Escalante Urrelo <dieguito@gmail.com> - Alessandro Decina <alessandro@nnva.org> + - Patryk Zawadzki <patrys@pld-linux.org> i18n: - czech translation by Vítězslav Kotrla <vitko@post.cz> @@ -2,6 +2,7 @@ ChangeLog for Cheese -------------------- version 0.2.1: + - we found the bug! v4l works now, courtesy of Patryk Zawadzki - added a popupmenu on the iconview - added the lucas(R)-eye of gnome iconview - if the same effects were chosen in photo and video, they wont apply. fixed diff --git a/src/cheese-pipeline.c b/src/cheese-pipeline.c index 3375e513..0835d353 100644 --- a/src/cheese-pipeline.c +++ b/src/cheese-pipeline.c @@ -168,15 +168,17 @@ cheese_pipeline_create() { if (cheese_pipeline_test("v4l2src ! fakesink")) { cheese_pipeline.source_pipeline = "v4l2src"; } else if (cheese_pipeline_test("v4lsrc ! video/x-raw-rgb,width=640,height=480 ! fakesink")) { - cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-rgb,width=640,height=480"; + cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-rgb,width=640,height=480 ! ffmpegcolorspace"; } else if (cheese_pipeline_test("v4lsrc ! video/x-raw-yuv,width=640,height=480 ! fakesink")) { - cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-yuv,width=640,height=480"; + cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-yuv,width=640,height=480 ! ffmpegcolorspace"; } else if (cheese_pipeline_test("v4lsrc ! video/x-raw-rgb,width=320,height=240 ! fakesink")) { - cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-rgb,width=320,height=240"; + cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-rgb,width=320,height=240 ! ffmpegcolorspace"; } else if (cheese_pipeline_test("v4lsrc ! video/x-raw-rgb,width=1280,height=960 ! fakesink")) { - cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-rgb,width=1280,height=960"; + cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-rgb,width=1280,height=960 ! ffmpegcolorspace"; + } else if (cheese_pipeline_test("v4lsrc ! video/x-raw-rgb,width=174,height=144 ! fakesink")) { + cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-rgb,width=174,height=144 ! ffmpegcolorspace"; } else if (cheese_pipeline_test("v4lsrc ! video/x-raw-rgb,width=160,height=120 ! fakesink")) { - cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-rgb,width=160,height=120"; + cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-rgb,width=160,height=120 ! ffmpegcolorspace"; } else if (cheese_pipeline_test("v4lsrc ! fakesink")) { cheese_pipeline.source_pipeline = "v4lsrc"; } else { |