Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1987 from thess/mjpg-streamer

Browse source 
mjpg-streamer: Fix SIGTRAP in v4l2uvc
This commit is contained in:
Ted Hess 2015-11-20 10:06:25 -05:00
commit 1253da8cfc
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
multimedia/mjpg-streamer/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mjpg-streamer PKG_NAME:=mjpg-streamer
PKG_REV:=182 PKG_REV:=182
PKG_VERSION:=r$(PKG_REV) PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=7 PKG_RELEASE:=8
PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com> PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2

11
multimedia/mjpg-streamer/patches/060-fix-sigtrap-in-v4l2uvc.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/plugins/input_uvc/v4l2uvc.c
+++ b/plugins/input_uvc/v4l2uvc.c
@@ -130,7 +130,7 @@ int init_videoIn(struct vdIn *vd, char *
return -1;
}
- memcpy(&pglobal->in[id].in_formats[pglobal->in[id].formatCount], &fmtdesc, sizeof(input_format));
+ memcpy(&pglobal->in[id].in_formats[pglobal->in[id].formatCount], &fmtdesc, sizeof(struct v4l2_fmtdesc));
if(fmtdesc.pixelformat == format)
pglobal->in[id].currentFormat = pglobal->in[id].formatCount;