update ffmpeg, MediaInfoLib to r3537

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2776 10f7b99b-c216-0410-bff0-8a66a9350fd8

5 files changed, 6 insertions, 19 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avcodec.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avcodec.h
index 0f42cfd07..a6358a7fb 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avcodec.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avcodec.h
@@ -47,7 +47,7 @@
 

 #define LIBAVCODEC_VERSION_MAJOR 52

 #define LIBAVCODEC_VERSION_MINOR 99

-#define LIBAVCODEC_VERSION_MICRO  0

+#define LIBAVCODEC_VERSION_MICRO  1

 

 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

                                                LIBAVCODEC_VERSION_MINOR, \

@@ -103,10 +103,6 @@
 #   define FF_INTERNALC_MEM_TYPE size_t

 #endif

 

-#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)

-#define AV_TIME_BASE            1000000

-static const AVRational AV_TIME_BASE_Q={1, AV_TIME_BASE};

-

 #if LIBAVCODEC_VERSION_MAJOR < 53

 #define CodecType AVMediaType

 

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.c
index 3d6b46d75..60da0d11e 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.c
@@ -4437,11 +4437,8 @@ av_cold void attribute_align_arg dsputil_init(DSPContext* c, AVCodecContext *avc
     c->float_to_int16_interleave = ff_float_to_int16_interleave_c;

 //    c->scalarproduct_int16 = scalarproduct_int16_c;

 //    c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_c;

-#if CONFIG_AAC_DECODER

     c->scalarproduct_float = scalarproduct_float_c;

-#endif

     c->butterflies_float = butterflies_float_c;

-#if CONFIG_AAC_DECODER

     c->vector_fmul_scalar = vector_fmul_scalar_c;

 

     c->vector_fmul_sv_scalar[0] = vector_fmul_sv_scalar_2_c;

@@ -4449,7 +4446,6 @@ av_cold void attribute_align_arg dsputil_init(DSPContext* c, AVCodecContext *avc
 

     c->sv_fmul_scalar[0] = sv_fmul_scalar_2_c;

     c->sv_fmul_scalar[1] = sv_fmul_scalar_4_c;

-#endif

 

     c->shrink[0]= av_image_copy_plane;

     c->shrink[1]= ff_shrink22;

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.h
index 8c1499165..61232644d 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.h
@@ -374,7 +374,6 @@ typedef struct DSPContext {
     /* assume len is a multiple of 8, and arrays are 16-byte aligned */

     void (*int32_to_float_fmul_scalar)(float *dst, const int *src, float mul, int len);

 //    void (*vector_clipf)(float *dst /* align 16 */, const float *src /* align 16 */, float min, float max, int len /* align 16 */);

-#if CONFIG_AAC_DECODER

     /**

      * Multiply a vector of floats by a scalar float.  Source and

      * destination vectors must overlap exactly or not at all.

@@ -418,7 +417,6 @@ typedef struct DSPContext {
      * @param len length of vectors, multiple of 4

      */

     float (*scalarproduct_float)(const float *v1, const float *v2, int len);

-#endif

     /**

      * Calculate the sum and difference of two vectors of floats.

      * @param v1  first input vector, sum output, 16-byte aligned

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/dsputil_mmx.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/dsputil_mmx.c
index f9d267b79..8c19b170d 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/dsputil_mmx.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/dsputil_mmx.c
@@ -2875,10 +2875,6 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
         }

 #endif

 

-/* disable audio related ASM for 64-bit builds

- * todo: test if it still causes crashes

- */

-#if ARCH_X86_32

         if(mm_flags & AV_CPU_FLAG_3DNOW){

             c->vorbis_inverse_coupling = vorbis_inverse_coupling_3dnow;

             c->vector_fmul = vector_fmul_3dnow;

@@ -2904,11 +2900,9 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
             c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_sse;

             c->float_to_int16 = float_to_int16_sse;

             c->float_to_int16_interleave = float_to_int16_interleave_sse;

-#if CONFIG_AAC_DECODER

 #if HAVE_YASM

             c->scalarproduct_float = ff_scalarproduct_float_sse;

 #endif

-#endif

         }

         if(mm_flags & AV_CPU_FLAG_3DNOW)

             c->vector_fmul_add = vector_fmul_add_3dnow; // faster than sse

@@ -2917,7 +2911,6 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
             c->float_to_int16 = float_to_int16_sse2;

             c->float_to_int16_interleave = float_to_int16_interleave_sse2;

         }

-#endif /* ARCH_X86_32 */

     }

 

     if (CONFIG_ENCODERS)

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcore/avcore.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcore/avcore.h
index b19efe8cd..ba3f10985 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcore/avcore.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcore/avcore.h
@@ -27,7 +27,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCORE_VERSION_MAJOR  0
-#define LIBAVCORE_VERSION_MINOR 15
+#define LIBAVCORE_VERSION_MINOR 16
 #define LIBAVCORE_VERSION_MICRO  0
 
 #define LIBAVCORE_VERSION_INT   AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
@@ -55,6 +55,10 @@ const char *avcore_configuration(void);
  */
 const char *avcore_license(void);
 
+#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
+#define AV_TIME_BASE            1000000
+static const AVRational AV_TIME_BASE_Q = {1, AV_TIME_BASE}; //#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
+
 /**
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.