[vlc-commits] Fixed the value of DV_NTSC_FRAME_SIZE.

[Laurent Aimar]

vlc/vlc-2.0 | branch: master | Laurent Aimar <fenrir at videolan.org> | Wed May 30 00:28:43 2012 +0200| [1ca954f3d362ec77e298a9cf0870b50425147515] | committer: Jean-Baptiste Kempf

Fixed the value of DV_NTSC_FRAME_SIZE.
(cherry picked from commit 4fbbd7cd097c4dcd2fadf705a2f28e3f0f9d5358)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=1ca954f3d362ec77e298a9cf0870b50425147515
---

 modules/demux/rawdv.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/demux/rawdv.c b/modules/demux/rawdv.c
index 26c5b45..3d7632e 100644
--- a/modules/demux/rawdv.c
+++ b/modules/demux/rawdv.c
@@ -74,8 +74,8 @@ vlc_module_end ()
 /*****************************************************************************
  * Constants
  *****************************************************************************/
-#define DV_PAL_FRAME_SIZE  144000
-#define DV_NTSC_FRAME_SIZE 122000
+#define DV_PAL_FRAME_SIZE  (12 * 150 * 80)
+#define DV_NTSC_FRAME_SIZE (10 * 150 * 80)
 
 /*****************************************************************************
  * Definitions of structures used by this plugin
@@ -213,7 +213,8 @@ static int Open( vlc_object_t * p_this )
     msg_Dbg( p_demux, "Realtime DV Source: %s", (p_sys->b_hurry_up)?"Yes":"No" );
 
     p_sys->i_dsf = dv_header.dsf;
-    p_sys->frame_size = dv_header.dsf ? 12 * 150 * 80 : 10 * 150 * 80;
+    p_sys->frame_size = dv_header.dsf ? DV_PAL_FRAME_SIZE
+                                      : DV_NTSC_FRAME_SIZE;
     p_sys->f_rate = dv_header.dsf ? 25 : 29.97;
 
     p_sys->i_pcr = 0;