Browse Source
vc1dec: Remove interlaced warning
Also add a note about the feature in the changelog. Signed-off-by: Martin Storsjö <martin@martin.st>tags/n2.0
Michael Niedermayer
Martin Storsjö
12 years ago
4 changed files with 2 additions and 6 deletions
Unified View
Diff Options
-
+1 -0Changelog
-
+0 -3libavcodec/vc1.c
-
+0 -2libavcodec/vc1.h
-
+1 -1libavcodec/version.h
+ 1
- 0
Changelog
View File
| @@ -21,6 +21,7 @@ version 10: | |||||
| - Apple Intermediate Codec decoder | - Apple Intermediate Codec decoder | ||||
| - Escape 130 video decoder | - Escape 130 video decoder | ||||
| - support for slice multithreading in libavfilter | - support for slice multithreading in libavfilter | ||||
| - VC-1 interlaced B-frame support | |||||
| version 9: | version 9: | ||||
+ 0
- 3
libavcodec/vc1.c
View File
| @@ -854,9 +854,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) | |||||
| if (fcm) { | if (fcm) { | ||||
| if (fcm == ILACE_FIELD) | if (fcm == ILACE_FIELD) | ||||
| field_mode = 1; | field_mode = 1; | ||||
| if (!v->warn_interlaced++) | |||||
| av_log(v->s.avctx, AV_LOG_ERROR, | |||||
| "Interlaced frames/fields support is incomplete\n"); | |||||
| } | } | ||||
| } else { | } else { | ||||
| fcm = PROGRESSIVE; | fcm = PROGRESSIVE; | ||||
+ 0
- 2
libavcodec/vc1.h
View File
| @@ -401,8 +401,6 @@ typedef struct VC1Context{ | |||||
| int end_mb_x; ///< Horizontal macroblock limit (used only by mss2) | int end_mb_x; ///< Horizontal macroblock limit (used only by mss2) | ||||
| int parse_only; ///< Context is used within parser | int parse_only; ///< Context is used within parser | ||||
| int warn_interlaced; | |||||
| } VC1Context; | } VC1Context; | ||||
| /** Find VC-1 marker in buffer | /** Find VC-1 marker in buffer | ||||
+ 1
- 1
libavcodec/version.h
View File
| @@ -28,7 +28,7 @@ | |||||
| #define LIBAVCODEC_VERSION_MAJOR 55 | #define LIBAVCODEC_VERSION_MAJOR 55 | ||||
| #define LIBAVCODEC_VERSION_MINOR 7 | #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, \ | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | ||||
| LIBAVCODEC_VERSION_MINOR, \ | LIBAVCODEC_VERSION_MINOR, \ | ||||