diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-26 03:44:05 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-05-28 13:56:29 +0300 |
| commit | 728214992e3698305550c1762f973d2ac567f016 (patch) | |
| tree | 410e351e271f8159233ef2bced10da4732fd0c55 | |
| parent | d8b9dbe7768c958dc40d65450f6cc5740f1b46a7 (diff) | |
| download | ffmpeg-728214992e3698305550c1762f973d2ac567f016.tar.gz | |
vc1dec: Remove interlaced warning
Also add a note about the feature in the changelog.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | libavcodec/vc1.c | 3 | ||||
| -rw-r--r-- | libavcodec/vc1.h | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
4 files changed, 2 insertions, 6 deletions
@@ -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, \ |