From 728214992e3698305550c1762f973d2ac567f016 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 26 Apr 2013 03:44:05 +0200 Subject: [PATCH] vc1dec: Remove interlaced warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also add a note about the feature in the changelog. Signed-off-by: Martin Storsjö --- Changelog | 1 + libavcodec/vc1.c | 3 --- libavcodec/vc1.h | 2 -- libavcodec/version.h | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Changelog b/Changelog index b8fbca2c4a..a20d62f864 100644 --- a/Changelog +++ b/Changelog @@ -21,6 +21,7 @@ version 10: - Apple Intermediate Codec decoder - Escape 130 video decoder - support for slice multithreading in libavfilter +- VC-1 interlaced B-frame support version 9: diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 7d09234f9b..d6586bfaeb 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -854,9 +854,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) if (fcm) { if (fcm == ILACE_FIELD) field_mode = 1; - if (!v->warn_interlaced++) - av_log(v->s.avctx, AV_LOG_ERROR, - "Interlaced frames/fields support is incomplete\n"); } } else { fcm = PROGRESSIVE; diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 8439203f88..0ece45a290 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -401,8 +401,6 @@ typedef struct VC1Context{ int end_mb_x; ///< Horizontal macroblock limit (used only by mss2) int parse_only; ///< Context is used within parser - - int warn_interlaced; } VC1Context; /** Find VC-1 marker in buffer diff --git a/libavcodec/version.h b/libavcodec/version.h index 5fd9bd2ff9..f3a2668e12 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 7 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MICRO 1 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \