Update internal FFmpeg copy.

4 files changed, 16 insertions, 18 deletions

diff --git a/contrib/ffmpeg/libavcodec/ps2/dsputil_mmi.c b/contrib/ffmpeg/libavcodec/ps2/dsputil_mmi.c
index 0d72ae88c..6a0582fe4 100644
--- a/contrib/ffmpeg/libavcodec/ps2/dsputil_mmi.c
+++ b/contrib/ffmpeg/libavcodec/ps2/dsputil_mmi.c
@@ -2,6 +2,9 @@
  * MMI optimized DSP utils
  * Copyright (c) 2000, 2001 Fabrice Bellard.
  *
+ * MMI optimization by Leon van Stuivenberg
+ * clear_blocks_mmi() by BroadQ
+ *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ -17,12 +20,9 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * MMI optimization by Leon van Stuivenberg
- * clear_blocks_mmi() by BroadQ
  */
 
-#include "../dsputil.h"
+#include "dsputil.h"
 #include "mmi.h"
 
 void ff_mmi_idct_put(uint8_t *dest, int line_size, DCTELEM *block);
diff --git a/contrib/ffmpeg/libavcodec/ps2/idct_mmi.c b/contrib/ffmpeg/libavcodec/ps2/idct_mmi.c
index dfe9b3726..2ba2ad02d 100644
--- a/contrib/ffmpeg/libavcodec/ps2/idct_mmi.c
+++ b/contrib/ffmpeg/libavcodec/ps2/idct_mmi.c
@@ -23,11 +23,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
-*/
+ */
 
-#include "../common.h"
-#include "../dsputil.h"
+#include "common.h"
+#include "dsputil.h"
 #include "mmi.h"
 
 #define BITS_INV_ACC    5       // 4 or 5 for IEEE
diff --git a/contrib/ffmpeg/libavcodec/ps2/mmi.h b/contrib/ffmpeg/libavcodec/ps2/mmi.h
index e2e49a86c..1e0a504f8 100644
--- a/contrib/ffmpeg/libavcodec/ps2/mmi.h
+++ b/contrib/ffmpeg/libavcodec/ps2/mmi.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __mmi_H
-#define __mmi_H
+#ifndef FFMPEG_MMI_H
+#define FFMPEG_MMI_H
 
 #define align16 __attribute__ ((aligned (16)))
 
@@ -168,5 +168,4 @@
 #define         pextlb(rs, rt, rd) \
         __asm__ __volatile__ ("pextlb  " #rd ", " #rs ", " #rt )
 
-#endif
-
+#endif /* FFMPEG_MMI_H */
diff --git a/contrib/ffmpeg/libavcodec/ps2/mpegvideo_mmi.c b/contrib/ffmpeg/libavcodec/ps2/mpegvideo_mmi.c
index 1e5f08aae..7f62e6e6d 100644
--- a/contrib/ffmpeg/libavcodec/ps2/mpegvideo_mmi.c
+++ b/contrib/ffmpeg/libavcodec/ps2/mpegvideo_mmi.c
@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 2000,2001 Fabrice Bellard.
  *
+ * MMI optimization by Leon van Stuivenberg
+ *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ -16,13 +18,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * MMI optimization by Leon van Stuivenberg
  */
 
-#include "../dsputil.h"
-#include "../mpegvideo.h"
-#include "../avcodec.h"
+#include "dsputil.h"
+#include "mpegvideo.h"
+#include "avcodec.h"
 
 static void dct_unquantize_h263_mmi(MpegEncContext *s,
                                   DCTELEM *block, int n, int qscale)
@@ -45,7 +45,7 @@ static void dct_unquantize_h263_mmi(MpegEncContext *s,
             qadd = 0;
             level = block[0];
         }
-        nCoeffs= 63; //does not allways use zigzag table
+        nCoeffs= 63; //does not always use zigzag table
     } else {
         nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ];
     }