Checkbox

Merge lp:~cypressyew/checkbox/fix-fswebcam-format into lp:checkbox

  1. fix-fswebcam-format
  2. Merge into trunk
Proposed by Po-Hsu Lin
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 3917
Merged at revision: 3917
Proposed branch: lp:~cypressyew/checkbox/fix-fswebcam-format
Merge into: lp:checkbox
Diff against target: 12 lines (+2/-0)
1 file modified
providers/plainbox-provider-checkbox/bin/camera_test (+2/-0)
To merge this branch: bzr merge lp:~cypressyew/checkbox/fix-fswebcam-format
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+265782@code.launchpad.net

Description of the change

The "MJPG" format name is what we got from the v4l2, fswebcam takes MJPEG for -p argument instead, this dirty workaround will replace it directly.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'providers/plainbox-provider-checkbox/bin/camera_test'
2--- providers/plainbox-provider-checkbox/bin/camera_test 2014-09-26 16:21:48 +0000
3+++ providers/plainbox-provider-checkbox/bin/camera_test 2015-07-24 08:31:30 +0000
4@@ -274,6 +274,8 @@
5 % (width, height), filename]
6 use_gstreamer = False
7 if pixelformat:
8+ if 'MJPG' == pixelformat: # special tweak for fswebcam
9+ pixelformat = 'MJPEG'
10 command.extend(["-p", pixelformat])
11
12 try:

Subscribers

People subscribed via source and target branches