diff options
| -rw-r--r-- | libavformat/dv1394.c | 10 | ||||
| -rw-r--r-- | libavformat/dv1394.h | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libavformat/dv1394.c b/libavformat/dv1394.c index 2eff220f68..5e8b83d2b4 100644 --- a/libavformat/dv1394.c +++ b/libavformat/dv1394.c @@ -91,21 +91,21 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap return -ENOMEM; } - dv->width = DV1394_WIDTH; - dv->height = DV1394_HEIGHT; + /* FIXME: Need a format change parameter */ + dv->format = DV1394_NTSC; if (ap->channel) dv->channel = ap->channel; else dv->channel = DV1394_DEFAULT_CHANNEL; - /* FIXME: Need a format change parameter */ - dv->format = DV1394_NTSC; - + dv->width = DV1394_WIDTH; if (dv->format == DV1394_NTSC) { + dv->height = DV1394_NTSC_HEIGHT; dv->frame_size = DV1394_NTSC_FRAME_SIZE; dv->frame_rate = 30; } else { + dv->height = DV1394_PAL_HEIGHT; dv->frame_size = DV1394_PAL_FRAME_SIZE; dv->frame_rate = 25; } diff --git a/libavformat/dv1394.h b/libavformat/dv1394.h index 1985bbda5f..6fcbdb0179 100644 --- a/libavformat/dv1394.h +++ b/libavformat/dv1394.h @@ -31,7 +31,8 @@ #define DV1394_RING_FRAMES 20 #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. */ |