updated ffmpeg

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

13 files changed, 303 insertions, 301 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avcodec.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avcodec.h
index 84e6ac199..8408c440c 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avcodec.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avcodec.h
@@ -44,7 +44,7 @@
 #include "libavutil/avutil.h"

 

 #define LIBAVCODEC_VERSION_MAJOR 52

-#define LIBAVCODEC_VERSION_MINOR 70

+#define LIBAVCODEC_VERSION_MINOR 78

 #define LIBAVCODEC_VERSION_MICRO  0

 

 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp56.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp56.h
index aa98d7fca..dd541f22e 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp56.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp56.h
@@ -48,8 +48,8 @@ typedef int  (*VP56ParseHeader)(VP56Context *s, const uint8_t *buf,
 
 typedef struct {
     int high;
-    int bits; /* Stored negated (i.e. negative "bits" is a positive number of bits left)
-               * in order to eliminate a negate in cache refilling */
+    int bits; /* stored negated (i.e. negative "bits" is a positive number of
+                 bits left) in order to eliminate a negate in cache refilling */
     const uint8_t *buffer;
     const uint8_t *end;
     unsigned long code_word;
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/common.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/common.h
index 4e727fafa..722a50c32 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/common.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/common.h
@@ -104,7 +104,7 @@ static inline av_const int av_log2_16bit_c(unsigned int v)
 #endif

 

 /**

- * Clips a signed integer value into the amin-amax range.

+ * Clip a signed integer value into the amin-amax range.

  * @param a value to clip

  * @param amin minimum value of the clip range

  * @param amax maximum value of the clip range

@@ -118,7 +118,7 @@ static inline av_const int av_clip(int a, int amin, int amax)
 }

 

 /**

- * Clips a signed integer value into the 0-255 range.

+ * Clip a signed integer value into the 0-255 range.

  * @param a value to clip

  * @return clipped value

  */

@@ -129,7 +129,7 @@ static inline av_const uint8_t av_clip_uint8(int a)
 }

 

 /**

- * Clips a signed integer value into the -128,127 range.

+ * Clip a signed integer value into the -128,127 range.

  * @param a value to clip

  * @return clipped value

  */

@@ -140,7 +140,7 @@ static inline av_const int8_t av_clip_int8(int a)
 }

 

 /**

- * Clips a signed integer value into the 0-65535 range.

+ * Clip a signed integer value into the 0-65535 range.

  * @param a value to clip

  * @return clipped value

  */

@@ -151,7 +151,7 @@ static inline av_const uint16_t av_clip_uint16(int a)
 }

 

 /**

- * Clips a signed integer value into the -32768,32767 range.

+ * Clip a signed integer value into the -32768,32767 range.

  * @param a value to clip

  * @return clipped value

  */

@@ -162,7 +162,7 @@ static inline av_const int16_t av_clip_int16(int a)
 }

 

 /**

- * Clips a signed 64-bit integer value into the -2147483648,2147483647 range.

+ * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.

  * @param a value to clip

  * @return clipped value

  */

@@ -173,7 +173,7 @@ static inline av_const int32_t av_clipl_int32(int64_t a)
 }

 

 /**

- * Clips a float value into the amin-amax range.

+ * Clip a float value into the amin-amax range.

  * @param a value to clip

  * @param amin minimum value of the clip range

  * @param amax maximum value of the clip range

@@ -186,7 +186,7 @@ static inline av_const float av_clipf(float a, float amin, float amax)
     else               return a;

 }

 

-/** Computes ceil(log2(x)).

+/** Compute ceil(log2(x)).

  * @param x value used to compute ceil(log2(x))

  * @return computed ceiling of log2(x)

  */

@@ -198,18 +198,16 @@ static inline av_const int av_ceil_log2(int x)
 #define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24))

 #define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((a) << 24))

 

-/*!

- * \def GET_UTF8(val, GET_BYTE, ERROR)

- * Converts a UTF-8 character (up to 4 bytes long) to its 32-bit UCS-4 encoded form

- * \param val is the output and should be of type uint32_t. It holds the converted

- * UCS-4 character and should be a left value.

- * \param GET_BYTE gets UTF-8 encoded bytes from any proper source. It can be

- * a function or a statement whose return value or evaluated value is of type

- * uint8_t. It will be executed up to 4 times for values in the valid UTF-8 range,

- * and up to 7 times in the general case.

- * \param ERROR action that should be taken when an invalid UTF-8 byte is returned

- * from GET_BYTE. It should be a statement that jumps out of the macro,

- * like exit(), goto, return, break, or continue.

+/**

+ * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.

+ *

+ * @param val      Output value, must be an lvalue of type uint32_t.

+ * @param GET_BYTE Expression reading one byte from the input.

+ *                 Evaluated up to 7 times (4 for the currently

+ *                 assigned Unicode range).  With a memory buffer

+ *                 input, this could be *ptr++.

+ * @param ERROR    Expression to be evaluated on invalid input,

+ *                 typically a goto statement.

  */

 #define GET_UTF8(val, GET_BYTE, ERROR)\

     val= GET_BYTE;\

@@ -226,17 +224,14 @@ static inline av_const int av_ceil_log2(int x)
         }\

     }

 

-/*!

- * \def GET_UTF16(val, GET_16BIT, ERROR)

- * Converts a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form

- * \param val is the output and should be of type uint32_t. It holds the converted

- * UCS-4 character and should be a left value.

- * \param GET_16BIT gets two bytes of UTF-16 encoded data converted to native endianness.

- * It can be a function or a statement whose return value or evaluated value is of type

- * uint16_t. It will be executed up to 2 times.

- * \param ERROR action that should be taken when an invalid UTF-16 surrogate is

- * returned from GET_BYTE. It should be a statement that jumps out of the macro,

- * like exit(), goto, return, break, or continue.

+/**

+ * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.

+ *

+ * @param val       Output value, must be an lvalue of type uint32_t.

+ * @param GET_16BIT Expression returning two bytes of UTF-16 data converted

+ *                  to native byte order.  Evaluated one or two times.

+ * @param ERROR     Expression to be evaluated on invalid input,

+ *                  typically a goto statement.

  */

 #define GET_UTF16(val, GET_16BIT, ERROR)\

     val = GET_16BIT;\

@@ -252,7 +247,7 @@ static inline av_const int av_ceil_log2(int x)
 

 /*!

  * \def PUT_UTF8(val, tmp, PUT_BYTE)

- * Converts a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).

+ * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).

  * \param val is an input-only argument and should be of type uint32_t. It holds

  * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If

  * val is given as a function it is executed only once.

@@ -288,7 +283,7 @@ static inline av_const int av_ceil_log2(int x)
 

 /*!

  * \def PUT_UTF16(val, tmp, PUT_16BIT)

- * Converts a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).

+ * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).

  * \param val is an input-only argument and should be of type uint32_t. It holds

  * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If

  * val is given as a function it is executed only once.

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/crc.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/crc.c
index d74c0cef1..92a2d7065 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/crc.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/crc.c
@@ -49,7 +49,7 @@ static AVCRC av_crc_table[AV_CRC_MAX][257];
 #endif

 

 /**

- * Initializes a CRC table.

+ * Initialize a CRC table.

  * @param ctx must be an array of size sizeof(AVCRC)*257 or sizeof(AVCRC)*1024

  * @param cts_size size of ctx in bytes

  * @param le If 1, the lowest bit represents the coefficient for the highest

@@ -96,7 +96,7 @@ int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size){
 }

 

 /**

- * Gets an initialized standard CRC table.

+ * Get an initialized standard CRC table.

  * @param crc_id ID of a standard CRC

  * @return a pointer to the CRC table or NULL on failure

  */

@@ -114,7 +114,7 @@ const AVCRC *av_crc_get_table(AVCRCId crc_id){
 }

 

 /**

- * Calculates the CRC of a block.

+ * Calculate the CRC of a block.

  * @param crc CRC of previous blocks if any or initial value for CRC

  * @return CRC updated with the data from the given block

  *

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/eval.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/eval.h
index 38b4c25ce..7a4f5f0c2 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/eval.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/eval.h
@@ -29,7 +29,7 @@
 typedef struct AVExpr AVExpr;
 
 /**
- * Parses and evaluates an expression.
+ * Parse and evaluate an expression.
  * Note, this is significantly slower than av_eval_expr().
  *
  * @param res a pointer to a double where is put the result value of
@@ -53,7 +53,7 @@ int av_parse_and_eval_expr(double *res, const char *s,
                            void *opaque, int log_offset, void *log_ctx);
 
 /**
- * Parses an expression.
+ * Parse an expression.
  *
  * @param expr a pointer where is put an AVExpr containing the parsed
  * value in case of successfull parsing, or NULL otherwise.
@@ -76,7 +76,7 @@ int av_parse_expr(AVExpr **expr, const char *s,
                   int log_offset, void *log_ctx);
 
 /**
- * Evaluates a previously parsed expression.
+ * Evaluate a previously parsed expression.
  *
  * @param const_values a zero terminated array of values for the identifiers from av_parse_expr() const_names
  * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
@@ -85,12 +85,12 @@ int av_parse_expr(AVExpr **expr, const char *s,
 double av_eval_expr(AVExpr *e, const double *const_values, void *opaque);
 
 /**
- * Frees a parsed expression previously created with av_parse_expr().
+ * Free a parsed expression previously created with av_parse_expr().
  */
 void av_free_expr(AVExpr *e);
 
 /**
- * Parses the string in numstr and returns its value as a double. If
+ * Parse the string in numstr and return its value as a double. If
  * the string is empty, contains only whitespaces, or does not contain
  * an initial substring that has the expected syntax for a
  * floating-point number, no conversion is performed. In this case,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/internal.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/internal.h
index a44395ad0..4f0cd4fe6 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/internal.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/internal.h
@@ -48,8 +48,8 @@
 

 

 /**

- * Marks a variable as used and prevents the compiler from optimizing it away.

- * This is usefull for asm that accesses varibles in ways that the compiler doesnt

+ * Mark a variable as used and prevent the compiler from optimizing it away.

+ * This is useful for asm that accesses varibles in ways that the compiler does not

  * understand

  */

 #ifndef attribute_used

@@ -203,7 +203,7 @@
 #include "libm.h"

 

 /**

- * Returns NULL if CONFIG_SMALL is true, otherwise the argument

+ * Return NULL if CONFIG_SMALL is true, otherwise the argument

  * without modification. Used to disable the definition of strings

  * (for example AVCodec long_names).

  */

@@ -215,12 +215,21 @@
 

 

 /**

- * Create a non default alias for a function with specified version.

- * This is needed when symbols are moved from a lib to a dependancy of the lib

- * because the gnu linker as of 2010 is buggy and fails to dynamicaly link if a symbol

- * is not found in the lib in which it was during link time with enabled versioning

- * even if a correctly versioned and matching symbol exists in another lib and

- * even if it did find that would it not contain an explicit check to fail

+ * Define a function with only the non-default version specified.

+ *

+ * On systems with ELF shared libraries, all symbols exported from

+ * FFmpeg libraries are tagged with the name and major version of the

+ * library to which they belong.  If a function is moved from one

+ * library to another, a wrapper must be retained in the original

+ * location to preserve binary compatibility.

+ *

+ * Functions defined with this macro will never be used to resolve

+ * symbols by the build-time linker.

+ *

+ * @param type return type of function

+ * @param name name of function

+ * @param args argument list of function

+ * @param ver  version tag to assign function

  */

 #if HAVE_SYMVER_ASM_LABEL

 #   define FF_SYMVER(type, name, args, ver)                     \

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/lfg.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/lfg.h
index b416683ea..745a855d1 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/lfg.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/lfg.h
@@ -1,65 +1,64 @@
-/*

- * Lagged Fibonacci PRNG

- * Copyright (c) 2008 Michael Niedermayer

- *

- * This file is part of FFmpeg.

- *

- * FFmpeg is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * FFmpeg is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * 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

- */

-

-#ifndef AVUTIL_LFG_H

-#define AVUTIL_LFG_H

-

-#include <stdint.h>

-#include "attributes.h"

-

-typedef struct {

-    unsigned int state[64];

-    int index;

-} AVLFG;

-

-void av_lfg_init(AVLFG *c, unsigned int seed);

-

-/**

- * Gets the next random unsigned 32-bit number using an ALFG.

- *

- * Please also consider a simple LCG like state= state*1664525+1013904223,

- * it may be good enough and faster for your specific use case.

- */

-static av_always_inline unsigned int av_lfg_get(AVLFG *c){

-    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];

-    return c->state[c->index++ & 63];

-}

-

-/**

- * Gets the next random unsigned 32-bit number using a MLFG.

- *

- * Please also consider av_lfg_get() above, it is faster.

- */

-static av_always_inline unsigned int av_mlfg_get(AVLFG *c){

-    unsigned int a= c->state[(c->index-55) & 63];

-    unsigned int b= c->state[(c->index-24) & 63];

-    return c->state[c->index++ & 63] = 2*a*b+a+b;

-}

-

-/**

- * Gets the next two numbers generated by a Box-Muller Gaussian

- * generator using the random numbers issued by lfg.

- *

- * @param out[2] array where are placed the two generated numbers

- */

-void av_bmg_get(AVLFG *lfg, double out[2]);

-

-#endif /* AVUTIL_LFG_H */

+/*
+ * Lagged Fibonacci PRNG
+ * Copyright (c) 2008 Michael Niedermayer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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
+ */
+
+#ifndef AVUTIL_LFG_H
+#define AVUTIL_LFG_H
+
+#include "attributes.h" /* for MSVC */
+
+typedef struct {
+    unsigned int state[64];
+    int index;
+} AVLFG;
+
+void av_lfg_init(AVLFG *c, unsigned int seed);
+
+/**
+ * Get the next random unsigned 32-bit number using an ALFG.
+ *
+ * Please also consider a simple LCG like state= state*1664525+1013904223,
+ * it may be good enough and faster for your specific use case.
+ */
+static av_always_inline unsigned int av_lfg_get(AVLFG *c){
+    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];
+    return c->state[c->index++ & 63];
+}
+
+/**
+ * Get the next random unsigned 32-bit number using a MLFG.
+ *
+ * Please also consider av_lfg_get() above, it is faster.
+ */
+static av_always_inline unsigned int av_mlfg_get(AVLFG *c){
+    unsigned int a= c->state[(c->index-55) & 63];
+    unsigned int b= c->state[(c->index-24) & 63];
+    return c->state[c->index++ & 63] = 2*a*b+a+b;
+}
+
+/**
+ * Get the next two numbers generated by a Box-Muller Gaussian
+ * generator using the random numbers issued by lfg.
+ *
+ * @param out[2] array where are placed the two generated numbers
+ */
+void av_bmg_get(AVLFG *lfg, double out[2]);
+
+#endif /* AVUTIL_LFG_H */
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/log.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/log.h
index 9fd17b791..862c3a7e0 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/log.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/log.h
@@ -25,7 +25,7 @@
 #include "avutil.h"
 
 /**
- * Describes the class of an AVClass context structure. That is an
+ * Describe the class of an AVClass context structure. That is an
  * arbitrary struct of which the first field is a pointer to an
  * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
  */
@@ -109,7 +109,7 @@ typedef struct {
 #define AV_LOG_DEBUG    48
 
 /**
- * Sends the specified message to the log if the level is less than or equal
+ * Send the specified message to the log if the level is less than or equal
  * to the current av_log_level. By default, all logging messages are sent to
  * stderr. This behavior can be altered by setting a different av_vlog callback
  * function.
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/mathematics.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/mathematics.h
index 0d14062cc..2fbb99018 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/mathematics.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/mathematics.h
@@ -67,31 +67,31 @@ enum AVRounding {
 };

 

 /**

- * Returns the greatest common divisor of a and b.

+ * Return the greatest common divisor of a and b.

  * If both a and b are 0 or either or both are <0 then behavior is

  * undefined.

  */

 int64_t av_const av_gcd(int64_t a, int64_t b);

 

 /**

- * Rescales a 64-bit integer with rounding to nearest.

+ * Rescale a 64-bit integer with rounding to nearest.

  * A simple a*b/c isn't possible as it can overflow.

  */

 int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;

 

 /**

- * Rescales a 64-bit integer with specified rounding.

+ * Rescale a 64-bit integer with specified rounding.

  * A simple a*b/c isn't possible as it can overflow.

  */

 int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;

 

 /**

- * Rescales a 64-bit integer by 2 rational numbers.

+ * Rescale a 64-bit integer by 2 rational numbers.

  */

 int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;

 

 /**

- * Compares 2 timestamps each in its own timebases.

+ * Compare 2 timestamps each in its own timebases.

  * The result of the function is undefined if one of the timestamps

  * is outside the int64_t range when represented in the others timebase.

  * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position

@@ -99,7 +99,7 @@ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
 int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);

 

 /**

- * Compares 2 integers modulo mod.

+ * Compare 2 integers modulo mod.

  * That is we compare integers a and b for which only the least

  * significant log2(mod) bits are known.

  *

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/mem.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/mem.h
index 71450e3d2..cc213053d 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/mem.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/mem.h
@@ -63,7 +63,7 @@
 #endif

 

 /**

- * Allocates a block of size bytes with alignment suitable for all

+ * Allocate a block of size bytes with alignment suitable for all

  * memory accesses (including vectors if available on the CPU).

  * @param size Size in bytes for the memory block to be allocated.

  * @return Pointer to the allocated block, NULL if the block cannot

@@ -73,9 +73,9 @@
 void *av_malloc(unsigned int size) av_malloc_attrib av_alloc_size(1);

 

 /**

- * Allocates or reallocates a block of memory.

- * If ptr is NULL and size > 0, allocates a new block. If

- * size is zero, frees the memory block pointed to by ptr.

+ * Allocate or reallocate a block of memory.

+ * If ptr is NULL and size > 0, allocate a new block. If

+ * size is zero, free the memory block pointed to by ptr.

  * @param size Size in bytes for the memory block to be allocated or

  * reallocated.

  * @param ptr Pointer to a memory block already allocated with

@@ -87,7 +87,7 @@ void *av_malloc(unsigned int size) av_malloc_attrib av_alloc_size(1);
 void *av_realloc(void *ptr, unsigned int size) av_alloc_size(2);

 

 /**

- * Frees a memory block which has been allocated with av_malloc(z)() or

+ * Free a memory block which has been allocated with av_malloc(z)() or

  * av_realloc().

  * @param ptr Pointer to the memory block which should be freed.

  * @note ptr = NULL is explicitly allowed.

@@ -97,9 +97,9 @@ void *av_realloc(void *ptr, unsigned int size) av_alloc_size(2);
 void av_free(void *ptr);

 

 /**

- * Allocates a block of size bytes with alignment suitable for all

+ * Allocate a block of size bytes with alignment suitable for all

  * memory accesses (including vectors if available on the CPU) and

- * zeroes all the bytes of the block.

+ * zero all the bytes of the block.

  * @param size Size in bytes for the memory block to be allocated.

  * @return Pointer to the allocated block, NULL if it cannot be allocated.

  * @see av_malloc()

@@ -107,7 +107,7 @@ void av_free(void *ptr);
 void *av_mallocz(unsigned int size) av_malloc_attrib av_alloc_size(1);

 

 /**

- * Duplicates the string s.

+ * Duplicate the string s.

  * @param s string to be duplicated

  * @return Pointer to a newly allocated string containing a

  * copy of s or NULL if the string cannot be allocated.

@@ -115,7 +115,7 @@ void *av_mallocz(unsigned int size) av_malloc_attrib av_alloc_size(1);
 char *av_strdup(const char *s) av_malloc_attrib;

 

 /**

- * Frees a memory block which has been allocated with av_malloc(z)() or

+ * Free a memory block which has been allocated with av_malloc(z)() or

  * av_realloc() and set the pointer pointing to it to NULL.

  * @param ptr Pointer to the pointer to the memory block which should

  * be freed.

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/pixdesc.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/pixdesc.h
index 940f86765..2cd579e1d 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/pixdesc.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/pixdesc.h
@@ -1,154 +1,154 @@
-/*

- * pixel format descriptor

- * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>

- *

- * This file is part of FFmpeg.

- *

- * FFmpeg is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * FFmpeg is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * 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

- */

-

-#ifndef AVUTIL_PIXDESC_H

-#define AVUTIL_PIXDESC_H

-

-#include <inttypes.h>

-

-typedef struct AVComponentDescriptor{

-    uint16_t plane        :2;            ///< which of the 4 planes contains the component

-

-    /**

-     * Number of elements between 2 horizontally consecutive pixels minus 1.

-     * Elements are bits for bitstream formats, bytes otherwise.

-     */

-    uint16_t step_minus1  :3;

-

-    /**

-     * Number of elements before the component of the first pixel plus 1.

-     * Elements are bits for bitstream formats, bytes otherwise.

-     */

-    uint16_t offset_plus1 :3;

-    uint16_t shift        :3;            ///< number of least significant bits that must be shifted away to get the value

-    uint16_t depth_minus1 :4;            ///< number of bits in the component minus 1

-}AVComponentDescriptor;

-

-/**

- * Descriptor that unambiguously describes how the bits of a pixel are

- * stored in the up to 4 data planes of an image. It also stores the

- * subsampling factors and number of components.

- *

- * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV

- *       and all the YUV variants) AVPixFmtDescriptor just stores how values

- *       are stored not what these values represent.

- */

-typedef struct AVPixFmtDescriptor{

-    const char *name;

-    uint8_t nb_components;      ///< The number of components each pixel has, (1-4)

-

-    /**

-     * Amount to shift the luma width right to find the chroma width.

-     * For YV12 this is 1 for example.

-     * chroma_width = -((-luma_width) >> log2_chroma_w)

-     * The note above is needed to ensure rounding up.

-     * This value only refers to the chroma components.

-     */

-    uint8_t log2_chroma_w;      ///< chroma_width = -((-luma_width )>>log2_chroma_w)

-

-    /**

-     * Amount to shift the luma height right to find the chroma height.

-     * For YV12 this is 1 for example.

-     * chroma_height= -((-luma_height) >> log2_chroma_h)

-     * The note above is needed to ensure rounding up.

-     * This value only refers to the chroma components.

-     */

-    uint8_t log2_chroma_h;

-

-    /**

-     * Parameters that describe how pixels are packed. If the format

-     * has chroma components, they must be stored in comp[1] and

-     * comp[2].

-     */

-    AVComponentDescriptor comp[4];

-    uint8_t flags; //ffdshow custom code (must match order as defined for MSVC in pixdesc.c)

-}AVPixFmtDescriptor;

-

-#define PIX_FMT_BE        1 ///< Pixel format is big-endian.

-#define PIX_FMT_PAL       2 ///< Pixel format has a palette in data[1], values are indexes in this palette.

-#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.

-#define PIX_FMT_HWACCEL   8 ///< Pixel format is an HW accelerated format.

-

-/**

- * The array of all the pixel format descriptors.

- */

-extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];

-

-/**

- * Reads a line from an image, and writes the values of the

- * pixel format component c to dst.

- *

- * @param data the array containing the pointers to the planes of the image

- * @param linesizes the array containing the linesizes of the image

- * @param desc the pixel format descriptor for the image

- * @param x the horizontal coordinate of the first pixel to read

- * @param y the vertical coordinate of the first pixel to read

- * @param w the width of the line to read, that is the number of

- * values to write to dst

- * @param read_pal_component if not zero and the format is a paletted

- * format writes the values corresponding to the palette

- * component c in data[1] to dst, rather than the palette indexes in

- * data[0]. The behavior is undefined if the format is not paletted.

- */

-void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],

-               const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);

-

-/**

- * Writes the values from src to the pixel format component c of an

- * image line.

- *

- * @param src array containing the values to write

- * @param data the array containing the pointers to the planes of the

- * image to write into. It is supposed to be zeroed.

- * @param linesizes the array containing the linesizes of the image

- * @param desc the pixel format descriptor for the image

- * @param x the horizontal coordinate of the first pixel to write

- * @param y the vertical coordinate of the first pixel to write

- * @param w the width of the line to write, that is the number of

- * values to write to the image line

- */

-void write_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],

-                const AVPixFmtDescriptor *desc, int x, int y, int c, int w);

-

-/**

- * Returns the pixel format corresponding to name.

- *

- * If there is no pixel format with name name, then looks for a

- * pixel format with the name corresponding to the native endian

- * format of name.

- * For example in a little-endian system, first looks for "gray16",

- * then for "gray16le".

- *

- * Finally if no pixel format has been found, returns PIX_FMT_NONE.

- */

-enum PixelFormat av_get_pix_fmt(const char *name);

-

-/**

- * Returns the number of bits per pixel used by the pixel format

- * described by pixdesc.

- *

- * The returned number of bits refers to the number of bits actually

- * used for storing the pixel information, that is padding bits are

- * not counted.

- */

-int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);

-

-#endif /* AVUTIL_PIXDESC_H */

+/*
+ * pixel format descriptor
+ * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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
+ */
+
+#ifndef AVUTIL_PIXDESC_H
+#define AVUTIL_PIXDESC_H
+
+#include <inttypes.h>
+
+typedef struct AVComponentDescriptor{
+    uint16_t plane        :2;            ///< which of the 4 planes contains the component
+
+    /**
+     * Number of elements between 2 horizontally consecutive pixels minus 1.
+     * Elements are bits for bitstream formats, bytes otherwise.
+     */
+    uint16_t step_minus1  :3;
+
+    /**
+     * Number of elements before the component of the first pixel plus 1.
+     * Elements are bits for bitstream formats, bytes otherwise.
+     */
+    uint16_t offset_plus1 :3;
+    uint16_t shift        :3;            ///< number of least significant bits that must be shifted away to get the value
+    uint16_t depth_minus1 :4;            ///< number of bits in the component minus 1
+}AVComponentDescriptor;
+
+/**
+ * Descriptor that unambiguously describes how the bits of a pixel are
+ * stored in the up to 4 data planes of an image. It also stores the
+ * subsampling factors and number of components.
+ *
+ * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
+ *       and all the YUV variants) AVPixFmtDescriptor just stores how values
+ *       are stored not what these values represent.
+ */
+typedef struct AVPixFmtDescriptor{
+    const char *name;
+    uint8_t nb_components;      ///< The number of components each pixel has, (1-4)
+
+    /**
+     * Amount to shift the luma width right to find the chroma width.
+     * For YV12 this is 1 for example.
+     * chroma_width = -((-luma_width) >> log2_chroma_w)
+     * The note above is needed to ensure rounding up.
+     * This value only refers to the chroma components.
+     */
+    uint8_t log2_chroma_w;      ///< chroma_width = -((-luma_width )>>log2_chroma_w)
+
+    /**
+     * Amount to shift the luma height right to find the chroma height.
+     * For YV12 this is 1 for example.
+     * chroma_height= -((-luma_height) >> log2_chroma_h)
+     * The note above is needed to ensure rounding up.
+     * This value only refers to the chroma components.
+     */
+    uint8_t log2_chroma_h;
+
+    /**
+     * Parameters that describe how pixels are packed. If the format
+     * has chroma components, they must be stored in comp[1] and
+     * comp[2].
+     */
+    AVComponentDescriptor comp[4];
+    uint8_t flags; //ffdshow custom code (must match order as defined for MSVC in pixdesc.c)
+}AVPixFmtDescriptor;
+
+#define PIX_FMT_BE        1 ///< Pixel format is big-endian.
+#define PIX_FMT_PAL       2 ///< Pixel format has a palette in data[1], values are indexes in this palette.
+#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.
+#define PIX_FMT_HWACCEL   8 ///< Pixel format is an HW accelerated format.
+
+/**
+ * The array of all the pixel format descriptors.
+ */
+extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
+
+/**
+ * Read a line from an image, and write the values of the
+ * pixel format component c to dst.
+ *
+ * @param data the array containing the pointers to the planes of the image
+ * @param linesizes the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to read
+ * @param y the vertical coordinate of the first pixel to read
+ * @param w the width of the line to read, that is the number of
+ * values to write to dst
+ * @param read_pal_component if not zero and the format is a paletted
+ * format writes the values corresponding to the palette
+ * component c in data[1] to dst, rather than the palette indexes in
+ * data[0]. The behavior is undefined if the format is not paletted.
+ */
+void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
+               const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
+
+/**
+ * Write the values from src to the pixel format component c of an
+ * image line.
+ *
+ * @param src array containing the values to write
+ * @param data the array containing the pointers to the planes of the
+ * image to write into. It is supposed to be zeroed.
+ * @param linesizes the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to write
+ * @param y the vertical coordinate of the first pixel to write
+ * @param w the width of the line to write, that is the number of
+ * values to write to the image line
+ */
+void write_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
+                const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
+
+/**
+ * Return the pixel format corresponding to name.
+ *
+ * If there is no pixel format with name name, then looks for a
+ * pixel format with the name corresponding to the native endian
+ * format of name.
+ * For example in a little-endian system, first looks for "gray16",
+ * then for "gray16le".
+ *
+ * Finally if no pixel format has been found, returns PIX_FMT_NONE.
+ */
+enum PixelFormat av_get_pix_fmt(const char *name);
+
+/**
+ * Return the number of bits per pixel used by the pixel format
+ * described by pixdesc.
+ *
+ * The returned number of bits refers to the number of bits actually
+ * used for storing the pixel information, that is padding bits are
+ * not counted.
+ */
+int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
+
+#endif /* AVUTIL_PIXDESC_H */
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/random_seed.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/random_seed.h
index 56520207d..7f7506323 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/random_seed.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/random_seed.h
@@ -22,10 +22,9 @@
 #define AVUTIL_RANDOM_SEED_H
 
 #include <stdint.h>
-#include <inttypes.h>
 
 /**
- * Gets a seed to use in conjunction with random functions.
+ * Get a seed to use in conjunction with random functions.
  */
 uint32_t av_get_random_seed(void);
 
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/rational.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/rational.h
index c9d4da2c8..bc67d9453 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/rational.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/rational.h
@@ -20,7 +20,7 @@
  */

 

 /**

- * @file libavutil/rational.h

+ * @file

  * rational numbers

  * @author Michael Niedermayer <michaelni@gmx.at>

  */

@@ -40,7 +40,7 @@ typedef struct AVRational{
 } AVRational;

 

 /**

- * Compares two rationals.

+ * Compare two rationals.

  * @param a first rational

  * @param b second rational

  * @return 0 if a==b, 1 if a>b and -1 if a<b

@@ -53,7 +53,7 @@ static av_always_inline int av_cmp_q(AVRational a, AVRational b){
 }

 

 /**

- * Converts rational to double.

+ * Convert rational to double.

  * @param a rational to convert

  * @return (double) a

  */

@@ -62,7 +62,7 @@ static av_always_inline double av_q2d(AVRational a){
 }

 

 /**

- * Reduces a fraction.

+ * Reduce a fraction.

  * This is useful for framerate calculations.

  * @param dst_num destination numerator

  * @param dst_den destination denominator

@@ -74,7 +74,7 @@ static av_always_inline double av_q2d(AVRational a){
 int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);

 

 /**

- * Multiplies two rationals.

+ * Multiply two rationals.

  * @param b first rational

  * @param c second rational

  * @return b*c

@@ -82,7 +82,7 @@ int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max)
 AVRational av_mul_q(AVRational b, AVRational c) av_const;

 

 /**

- * Divides one rational by another.

+ * Divide one rational by another.

  * @param b first rational

  * @param c second rational

  * @return b/c

@@ -90,7 +90,7 @@ AVRational av_mul_q(AVRational b, AVRational c) av_const;
 AVRational av_div_q(AVRational b, AVRational c) av_const;

 

 /**

- * Adds two rationals.

+ * Add two rationals.

  * @param b first rational

  * @param c second rational

  * @return b+c

@@ -98,7 +98,7 @@ AVRational av_div_q(AVRational b, AVRational c) av_const;
 AVRational av_add_q(AVRational b, AVRational c) av_const;

 

 /**

- * Subtracts one rational from another.

+ * Subtract one rational from another.

  * @param b first rational

  * @param c second rational

  * @return b-c

@@ -106,7 +106,7 @@ AVRational av_add_q(AVRational b, AVRational c) av_const;
 AVRational av_sub_q(AVRational b, AVRational c) av_const;

 

 /**

- * Converts a double precision floating point number to a rational.

+ * Convert a double precision floating point number to a rational.

  * @param d double to convert

  * @param max the maximum allowed numerator and denominator

  * @return (AVRational) d

@@ -120,7 +120,7 @@ AVRational av_d2q(double d, int max) av_const;
 int av_nearer_q(AVRational q, AVRational q1, AVRational q2);

 

 /**

- * Finds the nearest value in q_list to q.

+ * Find the nearest value in q_list to q.

  * @param q_list an array of rationals terminated by {0, 0}

  * @return the index of the nearest value found in the array

  */