Intialize the codec type to video.
Originally committed as revision 463 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
20f0154831
commit
28c66901a9
@ -221,6 +221,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
|
|||||||
s->fd = video_fd;
|
s->fd = video_fd;
|
||||||
s->frame_size = frame_size;
|
s->frame_size = frame_size;
|
||||||
|
|
||||||
|
st->codec.codec_type = CODEC_TYPE_VIDEO;
|
||||||
st->codec.codec_id = CODEC_ID_RAWVIDEO;
|
st->codec.codec_id = CODEC_ID_RAWVIDEO;
|
||||||
st->codec.width = width;
|
st->codec.width = width;
|
||||||
st->codec.height = height;
|
st->codec.height = height;
|
||||||
@ -245,11 +246,11 @@ static int v4l_mm_read_picture(VideoData *s, UINT8 *buf)
|
|||||||
/* Setup to capture the next frame */
|
/* Setup to capture the next frame */
|
||||||
gb_buf.frame = (gb_frame + 1) % gb_buffers.frames;
|
gb_buf.frame = (gb_frame + 1) % gb_buffers.frames;
|
||||||
if (ioctl(s->fd, VIDIOCMCAPTURE, &gb_buf) < 0) {
|
if (ioctl(s->fd, VIDIOCMCAPTURE, &gb_buf) < 0) {
|
||||||
if (errno == EAGAIN)
|
if (errno == EAGAIN)
|
||||||
fprintf(stderr,"Cannot Sync\n");
|
fprintf(stderr,"Cannot Sync\n");
|
||||||
else
|
else
|
||||||
perror("VIDIOCMCAPTURE");
|
perror("VIDIOCMCAPTURE");
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
gettimeofday(&tv_s, 0);
|
gettimeofday(&tv_s, 0);
|
||||||
|
Loading…
Reference in New Issue
Block a user