RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-18 12:56:56 +00:00
Code Issues Projects Releases Wiki Activity

1000l

Browse Source 
Originally committed as revision 1979 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi 2003-06-20 15:51:24 +00:00
parent 377ea75708
commit cad6f6cdee
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/dv1394.c
View File

@ -91,21 +91,21 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap
return -ENOMEM; return -ENOMEM;
} }
dv->width = DV1394_WIDTH; /* FIXME: Need a format change parameter */
dv->height = DV1394_HEIGHT; dv->format = DV1394_NTSC;
if (ap->channel) if (ap->channel)
dv->channel = ap->channel; dv->channel = ap->channel;
else else
dv->channel = DV1394_DEFAULT_CHANNEL; dv->channel = DV1394_DEFAULT_CHANNEL;
/* FIXME: Need a format change parameter */ dv->width = DV1394_WIDTH;
dv->format = DV1394_NTSC;
if (dv->format == DV1394_NTSC) { if (dv->format == DV1394_NTSC) {
dv->height = DV1394_NTSC_HEIGHT;
dv->frame_size = DV1394_NTSC_FRAME_SIZE; dv->frame_size = DV1394_NTSC_FRAME_SIZE;
dv->frame_rate = 30; dv->frame_rate = 30;
} else { } else {
dv->height = DV1394_PAL_HEIGHT;
dv->frame_size = DV1394_PAL_FRAME_SIZE; dv->frame_size = DV1394_PAL_FRAME_SIZE;
dv->frame_rate = 25; dv->frame_rate = 25;
} }

3
libavformat/dv1394.h
View File

@ -31,7 +31,8 @@
#define DV1394_RING_FRAMES 20 #define DV1394_RING_FRAMES 20
#define DV1394_WIDTH 720 #define DV1394_WIDTH 720
#define DV1394_HEIGHT 576 #define DV1394_NTSC_HEIGHT 480
#define DV1394_PAL_HEIGHT 576
/* This is the public user-space interface. Try not to break it. */ /* This is the public user-space interface. Try not to break it. */