Commit 28c66901 authored by Philip Gladstone's avatar Philip Gladstone

Intialize the codec type to video.

Originally committed as revision 463 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 20f01548
...@@ -221,6 +221,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) ...@@ -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) ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment