From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Mon, 22 Aug 2011 12:05:39 +0000 (+0000)
Subject: 2.0. parallel_yadif: Reduced overhead.
X-Git-Tag: dependencies_subtree~15
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ea2f27ecfd515593ab65a311e42ae27b7ac19d6b;p=casparcg

2.0. parallel_yadif: Reduced overhead.
     ffmpeg: Updated version.
---

diff --git a/ffmpeg 0.8/bin/avcodec-53.dll b/ffmpeg 0.8/bin/avcodec-53.dll
index ad696782a..0f6257f49 100644
Binary files a/ffmpeg 0.8/bin/avcodec-53.dll and b/ffmpeg 0.8/bin/avcodec-53.dll differ
diff --git a/ffmpeg 0.8/bin/avdevice-53.dll b/ffmpeg 0.8/bin/avdevice-53.dll
index d1071df69..d32a0df0c 100644
Binary files a/ffmpeg 0.8/bin/avdevice-53.dll and b/ffmpeg 0.8/bin/avdevice-53.dll differ
diff --git a/ffmpeg 0.8/bin/avfilter-2.dll b/ffmpeg 0.8/bin/avfilter-2.dll
index 2819f8347..94b0faf02 100644
Binary files a/ffmpeg 0.8/bin/avfilter-2.dll and b/ffmpeg 0.8/bin/avfilter-2.dll differ
diff --git a/ffmpeg 0.8/bin/avformat-53.dll b/ffmpeg 0.8/bin/avformat-53.dll
index 02d5bf3d4..f1450aaf3 100644
Binary files a/ffmpeg 0.8/bin/avformat-53.dll and b/ffmpeg 0.8/bin/avformat-53.dll differ
diff --git a/ffmpeg 0.8/bin/avutil-51.dll b/ffmpeg 0.8/bin/avutil-51.dll
index 528c80e57..a593dfc47 100644
Binary files a/ffmpeg 0.8/bin/avutil-51.dll and b/ffmpeg 0.8/bin/avutil-51.dll differ
diff --git a/ffmpeg 0.8/bin/postproc-51.dll b/ffmpeg 0.8/bin/postproc-51.dll
index 0c86639bd..ec94ea23f 100644
Binary files a/ffmpeg 0.8/bin/postproc-51.dll and b/ffmpeg 0.8/bin/postproc-51.dll differ
diff --git a/ffmpeg 0.8/bin/swscale-2.dll b/ffmpeg 0.8/bin/swscale-2.dll
index 77e4d7ee6..71a68dc0a 100644
Binary files a/ffmpeg 0.8/bin/swscale-2.dll and b/ffmpeg 0.8/bin/swscale-2.dll differ
diff --git a/ffmpeg 0.8/include/libavcodec/avcodec.h b/ffmpeg 0.8/include/libavcodec/avcodec.h
index c854958c6..3a1eef195 100644
--- a/ffmpeg 0.8/include/libavcodec/avcodec.h	
+++ b/ffmpeg 0.8/include/libavcodec/avcodec.h	
@@ -209,6 +209,7 @@ enum CodecID {
     CODEC_ID_JV,
     CODEC_ID_DFA,
     CODEC_ID_8SVX_RAW,
+    CODEC_ID_G2M,
 
     /* various PCM "codecs" */
     CODEC_ID_PCM_S16LE= 0x10000,
@@ -800,6 +801,9 @@ typedef struct AVPacket {
     uint8_t *data;
     int   size;
     int   stream_index;
+    /**
+     * A combination of AV_PKT_FLAG values
+     */
     int   flags;
     /**
      * Additional packet data that can be provided by the container.
@@ -840,7 +844,8 @@ typedef struct AVPacket {
      */
     int64_t convergence_duration;
 } AVPacket;
-#define AV_PKT_FLAG_KEY   0x0001
+#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
+#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
 
 /**
  * Audio Video Frame.
@@ -1483,7 +1488,7 @@ typedef struct AVCodecContext {
     float b_quant_offset;
 
     /**
-     * Error recognization; higher values will detect more errors but may
+     * Error recognition; higher values will detect more errors but may
      * misdetect some more or less valid parts as errors.
      * - encoding: unused
      * - decoding: Set by user.
@@ -1492,7 +1497,12 @@ typedef struct AVCodecContext {
 #define FF_ER_CAREFUL         1
 #define FF_ER_COMPLIANT       2
 #define FF_ER_AGGRESSIVE      3
+#if FF_API_VERY_AGGRESSIVE
 #define FF_ER_VERY_AGGRESSIVE 4
+#define FF_ER_EXPLODE         5
+#else
+#define FF_ER_EXPLODE         4
+#endif /* FF_API_VERY_AGGRESSIVE */
 
     /**
      * Called at the beginning of each frame to get a buffer for it.
@@ -3541,21 +3551,22 @@ const char *avcodec_configuration(void);
  */
 const char *avcodec_license(void);
 
+#if FF_API_AVCODEC_INIT
 /**
- * Initialize libavcodec.
- * If called more than once, does nothing.
- *
- * @warning This function must be called before any other libavcodec
- * function.
- *
- * @warning This function is not thread-safe.
+ * @deprecated this function is called automatically from avcodec_register()
+ * and avcodec_register_all(), there is no need to call it manually
  */
+attribute_deprecated
 void avcodec_init(void);
+#endif
 
 /**
  * Register the codec codec and initialize libavcodec.
  *
- * @see avcodec_init(), avcodec_register_all()
+ * @warning either this function or avcodec_register_all() must be called
+ * before any other libavcodec functions.
+ *
+ * @see avcodec_register_all()
  */
 void avcodec_register(AVCodec *codec);
 
diff --git a/ffmpeg 0.8/include/libavcodec/version.h b/ffmpeg 0.8/include/libavcodec/version.h
index 1883768a2..adb9c95d9 100644
--- a/ffmpeg 0.8/include/libavcodec/version.h	
+++ b/ffmpeg 0.8/include/libavcodec/version.h	
@@ -21,7 +21,7 @@
 #define AVCODEC_VERSION_H
 
 #define LIBAVCODEC_VERSION_MAJOR 53
-#define LIBAVCODEC_VERSION_MINOR  9
+#define LIBAVCODEC_VERSION_MINOR 10
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -77,5 +77,11 @@
 #ifndef FF_API_DRC_SCALE
 #define FF_API_DRC_SCALE        (LIBAVCODEC_VERSION_MAJOR < 54)
 #endif
+#ifndef FF_API_VERY_AGGRESSIVE
+#define FF_API_VERY_AGGRESSIVE  (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_AVCODEC_INIT
+#define FF_API_AVCODEC_INIT     (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
 
 #endif /* AVCODEC_VERSION_H */
diff --git a/ffmpeg 0.8/include/libavfilter/avfilter.h b/ffmpeg 0.8/include/libavfilter/avfilter.h
index 913a52b22..5df97aa5d 100644
--- a/ffmpeg 0.8/include/libavfilter/avfilter.h	
+++ b/ffmpeg 0.8/include/libavfilter/avfilter.h	
@@ -29,8 +29,8 @@
 #include "libavutil/rational.h"
 
 #define LIBAVFILTER_VERSION_MAJOR  2
-#define LIBAVFILTER_VERSION_MINOR 27
-#define LIBAVFILTER_VERSION_MICRO  3
+#define LIBAVFILTER_VERSION_MINOR 28
+#define LIBAVFILTER_VERSION_MICRO  1
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
@@ -438,15 +438,18 @@ struct AVFilterPad {
     /**
      * Link configuration callback.
      *
-     * For output pads, this should set the link properties such as
-     * width/height. This should NOT set the format property - that is
-     * negotiated between filters by the filter system using the
+     * For output pads, this should set the following link properties:
+     * video: width, height, sample_aspect_ratio, time_base
+     * audio: sample_rate.
+     *
+     * This should NOT set properties such as format, channel_layout, etc which
+     * are negotiated between filters by the filter system using the
      * query_formats() callback before this function is called.
      *
      * For input pads, this should check the properties of the link, and update
      * the filter's internal state as necessary.
      *
-     * For both input and output filters, this should return zero on success,
+     * For both input and output pads, this should return zero on success,
      * and another value on error.
      */
     int (*config_props)(AVFilterLink *link);
@@ -464,12 +467,6 @@ void avfilter_default_end_frame(AVFilterLink *link);
 /** default handler for filter_samples() for audio inputs */
 void avfilter_default_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
 
-/** default handler for config_props() for audio/video outputs */
-int avfilter_default_config_output_link(AVFilterLink *link);
-
-/** default handler for config_props() for audio/video inputs */
-int avfilter_default_config_input_link (AVFilterLink *link);
-
 /** default handler for get_video_buffer() for video inputs */
 AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link,
                                                      int perms, int w, int h);
diff --git a/ffmpeg 0.8/include/libavformat/avformat.h b/ffmpeg 0.8/include/libavformat/avformat.h
index 7c041f6e8..59a4240bd 100644
--- a/ffmpeg 0.8/include/libavformat/avformat.h	
+++ b/ffmpeg 0.8/include/libavformat/avformat.h	
@@ -774,6 +774,7 @@ typedef struct AVFormatContext {
 #define AVFMT_FLAG_RTP_HINT     0x0040 ///< Deprecated, use the -movflags rtphint muxer specific AVOption instead
 #endif
 #define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
+#define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
 #define AVFMT_FLAG_MP4A_LATM    0x8000 ///< Enable RTP MP4A-LATM payload
 #define AVFMT_FLAG_SORT_DTS    0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
 #define AVFMT_FLAG_PRIV_OPT    0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
@@ -1188,6 +1189,7 @@ int avformat_alloc_output_context2(AVFormatContext **ctx, AVOutputFormat *oforma
  *
  * @deprecated use avformat_find_stream_info.
  */
+attribute_deprecated
 int av_find_stream_info(AVFormatContext *ic);
 #endif
 
diff --git a/ffmpeg 0.8/include/libavutil/avutil.h b/ffmpeg 0.8/include/libavutil/avutil.h
index 568f66b98..ffcac1c15 100644
--- a/ffmpeg 0.8/include/libavutil/avutil.h	
+++ b/ffmpeg 0.8/include/libavutil/avutil.h	
@@ -41,7 +41,7 @@
 
 #define LIBAVUTIL_VERSION_MAJOR 51
 #define LIBAVUTIL_VERSION_MINOR 11
-#define LIBAVUTIL_VERSION_MICRO  0
+#define LIBAVUTIL_VERSION_MICRO  1
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \
diff --git a/ffmpeg 0.8/include/libswscale/swscale.h b/ffmpeg 0.8/include/libswscale/swscale.h
index a4b3a4807..f84e8798b 100644
--- a/ffmpeg 0.8/include/libswscale/swscale.h	
+++ b/ffmpeg 0.8/include/libswscale/swscale.h	
@@ -239,15 +239,6 @@ int sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[],
               const int srcStride[], int srcSliceY, int srcSliceH,
               uint8_t* const dst[], const int dstStride[]);
 
-#if LIBSWSCALE_VERSION_MAJOR < 1
-/**
- * @deprecated Use sws_scale() instead.
- */
-int sws_scale_ordered(struct SwsContext *context, const uint8_t* const src[],
-                      int srcStride[], int srcSliceY, int srcSliceH,
-                      uint8_t* dst[], int dstStride[]) attribute_deprecated;
-#endif
-
 /**
  * @param inv_table the yuv2rgb coefficients, normally ff_yuv2rgb_coeffs[x]
  * @return -1 if not supported
@@ -306,13 +297,6 @@ void sws_shiftVec(SwsVector *a, int shift);
  */
 SwsVector *sws_cloneVec(SwsVector *a);
 
-#if LIBSWSCALE_VERSION_MAJOR < 1
-/**
- * @deprecated Use sws_printVec2() instead.
- */
-attribute_deprecated void sws_printVec(SwsVector *a);
-#endif
-
 /**
  * Prints with av_log() a textual representation of the vector a
  * if log_level <= av_log_level.
diff --git a/ffmpeg 0.8/lib/avcodec.lib b/ffmpeg 0.8/lib/avcodec.lib
index fffaf7c24..9ac006dbd 100644
Binary files a/ffmpeg 0.8/lib/avcodec.lib and b/ffmpeg 0.8/lib/avcodec.lib differ
diff --git a/ffmpeg 0.8/lib/avdevice.lib b/ffmpeg 0.8/lib/avdevice.lib
index 5f40d0bcd..a06d30e50 100644
Binary files a/ffmpeg 0.8/lib/avdevice.lib and b/ffmpeg 0.8/lib/avdevice.lib differ
diff --git a/ffmpeg 0.8/lib/avfilter.lib b/ffmpeg 0.8/lib/avfilter.lib
index e8a6e9d09..1236fef1b 100644
Binary files a/ffmpeg 0.8/lib/avfilter.lib and b/ffmpeg 0.8/lib/avfilter.lib differ
diff --git a/ffmpeg 0.8/lib/avformat.lib b/ffmpeg 0.8/lib/avformat.lib
index 80c2cb761..85cbdf436 100644
Binary files a/ffmpeg 0.8/lib/avformat.lib and b/ffmpeg 0.8/lib/avformat.lib differ
diff --git a/ffmpeg 0.8/lib/avutil.lib b/ffmpeg 0.8/lib/avutil.lib
index cb86421ce..f0e356640 100644
Binary files a/ffmpeg 0.8/lib/avutil.lib and b/ffmpeg 0.8/lib/avutil.lib differ
diff --git a/ffmpeg 0.8/lib/postproc.lib b/ffmpeg 0.8/lib/postproc.lib
index 1ef1cd512..4664b0ac1 100644
Binary files a/ffmpeg 0.8/lib/postproc.lib and b/ffmpeg 0.8/lib/postproc.lib differ
diff --git a/ffmpeg 0.8/lib/swscale.lib b/ffmpeg 0.8/lib/swscale.lib
index 1767b1fbf..151b6e95e 100644
Binary files a/ffmpeg 0.8/lib/swscale.lib and b/ffmpeg 0.8/lib/swscale.lib differ