summaryrefslogtreecommitdiff
path: root/libavformat/dv1394.h
diff options
context:
space:
mode:
authorRoman Shaposhnik <roman@shaposhnik.org>2003-08-06 05:40:38 +0000
committerRoman Shaposhnik <roman@shaposhnik.org>2003-08-06 05:40:38 +0000
commit1fbe1a61b1fdccbe596b5418e8456fcd246f072d (patch)
tree2835fd16f8dd0007269c2e2c0e6f843eafc948cd /libavformat/dv1394.h
parent6e23091277e17e80bc3f63091584aa290d081c21 (diff)
patch for DV capturing by Dan Dennedy <dan at dennedy dot org>
Originally committed as revision 2105 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/dv1394.h')
-rw-r--r--libavformat/dv1394.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/dv1394.h b/libavformat/dv1394.h
index 6fcbdb0179..8c0422a5d9 100644
--- a/libavformat/dv1394.h
+++ b/libavformat/dv1394.h
@@ -26,7 +26,7 @@
#ifndef _DV_1394_H
#define _DV_1394_H
-#define DV1394_DEFAULT_CHANNEL 0x63
+#define DV1394_DEFAULT_CHANNEL 63
#define DV1394_DEFAULT_CARD 0
#define DV1394_RING_FRAMES 20
@@ -199,12 +199,12 @@
#define DV1394_MAX_FRAMES 32
/* number of *full* isochronous packets per DV frame */
-#define DV1394_NTSC_PACKETS_PER_FRAME 300
-#define DV1394_PAL_PACKETS_PER_FRAME 250
+#define DV1394_NTSC_PACKETS_PER_FRAME 250
+#define DV1394_PAL_PACKETS_PER_FRAME 300
/* size of one frame's worth of DV data, in bytes */
#define DV1394_NTSC_FRAME_SIZE (480 * DV1394_NTSC_PACKETS_PER_FRAME)
-#define DV1394_PAL_FRAME_SIZE (576 * DV1394_PAL_PACKETS_PER_FRAME)
+#define DV1394_PAL_FRAME_SIZE (480 * DV1394_PAL_PACKETS_PER_FRAME)
/* ioctl() commands */