AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)

[ffmpeg] / libavformat / dv1394.h

diff --git a/libavformat/dv1394.h b/libavformat/dv1394.h
index 1985bbda5f5237c876b7c2eef249a425cb484e33..8c0422a5d949669ef873eacce3b2a4a91af85bdc 100644 (file)
--- a/libavformat/dv1394.h
+++ b/libavformat/dv1394.h
@@ -26,12 +26,13 @@
 #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
 
 #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. */
 
@@ -198,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 */