Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compatibility fix to get mjpg_streamer work with kernel 3.18, v2 #4

Merged
merged 2 commits into from
Feb 13, 2015
Merged

Compatibility fix to get mjpg_streamer work with kernel 3.18, v2 #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85d81de
Revert "Compatibility fix to get mjpg_streamer work with kernel 3.18"
foosel Feb 13, 2015
61efdbf
Compatibility fix to get mjpg_streamer working with kernel 3.18, v2
foosel Feb 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions mjpg-streamer-experimental/plugins/input_uvc/v4l2uvc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,6 @@ int uvcGrab(struct vdIn *vd)
{
#define HEADERFRAME1 0xaf
int ret;
int32_t bytesused;

if(vd->streamingState == STREAMING_OFF) {
if(video_enable(vd))
Expand All @@ -512,7 +511,6 @@ int uvcGrab(struct vdIn *vd)
perror("Unable to dequeue buffer");
goto err;
}
bytesused = vd->buf.bytesused;

switch(vd->formatIn) {
case V4L2_PIX_FMT_MJPEG:
Expand Down Expand Up @@ -551,7 +549,6 @@ int uvcGrab(struct vdIn *vd)
}

ret = xioctl(vd->fd, VIDIOC_QBUF, &vd->buf);
vd->buf.bytesused = bytesused;
if(ret < 0) {
perror("Unable to requeue buffer");
goto err;
Expand Down