From: Christophe Massiot <massiot@videolan.org>
Date: Mon, 17 Jan 2000 13:49:25 +0000 (+0000)
Subject: Fin du parsage des I.
X-Git-Tag: 0.1.99e~241
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f0f225c412fa38cd5c5463ee947ad6381017ea0d;p=vlc

Fin du parsage des I.
---

diff --git a/include/config.h b/include/config.h
index e2ead05929..f9fb7deff2 100644
--- a/include/config.h
+++ b/include/config.h
@@ -43,7 +43,7 @@
 #define PROGRAM_OPTIONS                 VIDEO_OPTIONS " " ARCH_OPTIONS
 
 /* Program version and copyright message */
-#define PROGRAM_VERSION		        "DR 2.1"
+#define PROGRAM_VERSION		        "1.0-dev"
 #define COPYRIGHT_MESSAGE	        "VideoLAN Client v" PROGRAM_VERSION " (" __DATE__ ") - " \
                                         PROGRAM_OPTIONS " - (c)1999 VideoLAN"
 
@@ -296,7 +296,7 @@
 #define VFIFO_SIZE                      4095
 
 /* Maximum number of macroblocks in a picture. */
-#define MAX_MB                          2048
+#define MAX_MB                          32767
 
 /*******************************************************************************
  * Video decoder configuration
diff --git a/include/vlc.h.new b/include/vlc.h.new
index 09cb3569d0..a2a58c57c4 100644
--- a/include/vlc.h.new
+++ b/include/vlc.h.new
@@ -48,7 +48,6 @@
 #include "vlc_thread.h"
 #include "netutils.h"
 #include "debug.h"
-#include "xutils.h"
 #include "intf_msg.h"
 
 /* Input */
diff --git a/src/video_decoder/video_decoder.c b/src/video_decoder/video_decoder.c
index aeb38aacf0..d452e24d4f 100644
--- a/src/video_decoder/video_decoder.c
+++ b/src/video_decoder/video_decoder.c
@@ -186,7 +186,7 @@ static void RunThread( vdec_thread_t *p_vdec )
         return;
     }
     p_vdec->b_run = 1;
-
+p_vdec->b_error = 1;
     /*
      * Main loop - it is not executed if an error occured during
      * initialization
diff --git a/src/video_parser/vpar_blocks.c b/src/video_parser/vpar_blocks.c
index 04a7220709..1f81d45773 100644
--- a/src/video_parser/vpar_blocks.c
+++ b/src/video_parser/vpar_blocks.c
@@ -607,7 +607,7 @@ void vpar_ParseMacroblock( vpar_thread_t * p_vpar, int * pi_mb_address,
 
     //*pi_mb_address += MacroblockAddressIncrement( p_vpar );
     b_stop = i_inc > 1;
-    fprintf( stderr, "inc : %d (%d)\n", *pi_mb_address, i_inc );
+//    fprintf( stderr, "inc : %d (%d)\n", *pi_mb_address, i_inc );
 if( 0  )//i_count > 8 )
 {
     exit(0);
diff --git a/src/video_parser/vpar_headers.c b/src/video_parser/vpar_headers.c
index c78b32026f..7aa0f7fc8d 100644
--- a/src/video_parser/vpar_headers.c
+++ b/src/video_parser/vpar_headers.c
@@ -430,7 +430,7 @@ static void SequenceHeader( vpar_thread_t * p_vpar )
     p_vpar->sequence.i_mb_width = (p_vpar->sequence.i_width + 15) / 16;
     p_vpar->sequence.i_mb_height = (p_vpar->sequence.b_progressive) ?
                                    (p_vpar->sequence.i_height + 15) / 16 :
-                                   2 * (p_vpar->sequence.i_height + 31) / 32;
+                                   2 * ((p_vpar->sequence.i_height + 31) / 32);
     p_vpar->sequence.i_mb_size = p_vpar->sequence.i_mb_width
                                         * p_vpar->sequence.i_mb_height;
     p_vpar->sequence.i_width = (p_vpar->sequence.i_mb_width * 16);
@@ -747,7 +747,7 @@ fprintf(stderr, "Image trashee\n");
     }
     else if( p_vpar->picture.i_current_structure == FRAME_STRUCTURE )
     {
-fprintf(stderr, "Image decodee\n");
+fprintf(stderr, "Image parsee\n");
         /* Frame completely parsed. */
         P_picture->i_deccount = p_vpar->sequence.i_mb_size;
         for( i_mb = 0; i_mb < p_vpar->sequence.i_mb_size; i_mb++ )