ffmpeg sync

CVS patchset: 7872
CVS date: 2006/02/05 14:11:16

1 files changed, 6 insertions, 8 deletions

diff --git a/src/libffmpeg/libavcodec/alpha/mpegvideo_alpha.c b/src/libffmpeg/libavcodec/alpha/mpegvideo_alpha.c
index f64fb7472..4c512451e 100644
--- a/src/libffmpeg/libavcodec/alpha/mpegvideo_alpha.c
+++ b/src/libffmpeg/libavcodec/alpha/mpegvideo_alpha.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "asm.h"
@@ -28,22 +28,22 @@ static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block,
     uint64_t qmul, qadd;
     uint64_t correction;
     DCTELEM *orig_block = block;
-    DCTELEM block0;
+    DCTELEM block0;             /* might not be used uninitialized */
 
     qadd = WORD_VEC((qscale - 1) | 1);
     qmul = qscale << 1;
-    /* This mask kills spill from negative subwords to the next subword.  */ 
+    /* This mask kills spill from negative subwords to the next subword.  */
     correction = WORD_VEC((qmul - 1) + 1); /* multiplication / addition */
 
     if (!s->h263_aic) {
-        if (n < 4) 
+        if (n < 4)
             block0 = block[0] * s->y_dc_scale;
         else
             block0 = block[0] * s->c_dc_scale;
     } else {
         qadd = 0;
     }
-    n_coeffs = 63; // does not always use zigzag table 
+    n_coeffs = 63; // does not always use zigzag table
 
     for(i = 0; i <= n_coeffs; block += 4, i += 4) {
         uint64_t levels, negmask, zeros, add;
@@ -92,12 +92,10 @@ static void dct_unquantize_h263_inter_axp(MpegEncContext *s, DCTELEM *block,
     int i, n_coeffs;
     uint64_t qmul, qadd;
     uint64_t correction;
-    DCTELEM *orig_block = block;
-    DCTELEM block0;
 
     qadd = WORD_VEC((qscale - 1) | 1);
     qmul = qscale << 1;
-    /* This mask kills spill from negative subwords to the next subword.  */ 
+    /* This mask kills spill from negative subwords to the next subword.  */
     correction = WORD_VEC((qmul - 1) + 1); /* multiplication / addition */
 
     n_coeffs = s->intra_scantable.raster_end[s->block_last_index[n]];