[commit][3580] Fix several illegal returns in libmpeg support code for the Mpeg3Plugin

 
Revision: 3580
Author:   eliot
Date:     2016-02-10 13:00:41 -0800 (Wed, 10 Feb 2016)
Log Message:
-----------
Fix several illegal returns in libmpeg support code for the Mpeg3Plugin

Modified Paths:
--------------
    trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c
    trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c
    trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c

Property Changed:
----------------
    trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h

Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c
===================================================================
--- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c 2016-02-10 20:52:25 UTC (rev 3579)
+++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c 2016-02-10 21:00:41 UTC (rev 3580)
@@ -884,7 +884,7 @@
  if(gr_info->block_type == 2)
  {
      if(!gr_info->mixed_block_flag)
-         return;
+         return 0;
      sblim = 1;
  }
  else

Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c
===================================================================
--- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c 2016-02-10 20:52:25 UTC (rev 3579)
+++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c 2016-02-10 21:00:41 UTC (rev 3580)
@@ -154,7 +154,7 @@
 
 /* decode one intra coded MPEG-1 block */
 
-int mpeg3video_getintrablock(mpeg3_slice_t *slice,
+void mpeg3video_getintrablock(mpeg3_slice_t *slice,
  mpeg3video_t *video,
  int comp,
  int dc_dct_pred[])
@@ -179,7 +179,7 @@
    bp[0] <<= 4;
 #endif
 
-   if(slice->fault) return 1;
+   if(slice->fault) return;
 
 /* decode AC coefficients */
    for(i = 1; ; i++)
@@ -265,7 +265,7 @@
 /* not a sparse matrix ! */
        slice->sparse[comp] = 0;
  }
- return 0;
+ return;
 }
 
 
@@ -369,7 +369,7 @@
 
 
 /* decode one intra coded MPEG-2 block */
-int mpeg3video_getmpg2intrablock(mpeg3_slice_t *slice,
+void mpeg3video_getmpg2intrablock(mpeg3_slice_t *slice,
  mpeg3video_t *video,
  int comp,
  int dc_dct_pred[])
@@ -444,7 +444,7 @@
  {
 /*     fprintf(stderr,"mpeg3video_getmpg2intrablock: invalid Huffman code\n"); */
      slice->fault = 1;
-     return 1;
+     return;
      }
 
      mpeg3slice_flushbits(slice_buffer, tab->len);
@@ -492,13 +492,13 @@
 /* not a sparse matrix ! */
      slice->sparse[comp] = 0;
  }
- return 1;
+ return;
 }
 
 
 /* decode one non-intra coded MPEG-2 block */
 
-int mpeg3video_getmpg2interblock(mpeg3_slice_t *slice,
+void mpeg3video_getmpg2interblock(mpeg3_slice_t *slice,
  mpeg3video_t *video,
  int comp)
 {
@@ -563,7 +563,7 @@
  {
 /*         fprintf(stderr, "mpeg3video_getmpg2interblock: invalid signed_level (escape)\n"); */
          slice->fault = 1;
-         return 1;
+         return;
      }
      if((sign = (val >= 2048)) != 0) val = 4096 - val;
      }
@@ -591,7 +591,7 @@
  {
        slice->sparse[comp] = 0;
  }
- return 0;
+ return;
 }
 
 

Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c
===================================================================
--- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c 2016-02-10 20:52:25 UTC (rev 3579)
+++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c 2016-02-10 21:00:41 UTC (rev 3580)
@@ -70,7 +70,7 @@
 
 
 
-int mpeg3video_idctrow(short *blk)
+void mpeg3video_idctrow(short *blk)
 {
  int x0, x1, x2, x3, x4, x5, x6, x7, x8;
 
@@ -133,7 +133,7 @@
  */
 
 
-int mpeg3video_idctcol(short *blk)
+void mpeg3video_idctcol(short *blk)
 {
   int x0, x1, x2, x3, x4, x5, x6, x7, x8;
 


Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Wed Feb 10 09:35:01 PST 2016
   + Wed Feb 10 12:59:40 PST 2016