starred/ffmpeg-rockchip-nyanmisaka
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-24 02:20:56 +01:00
Code Issues Projects Packages Wiki Activity Actions

vc1dec: Remove interlaced warning

Browse source 
Also add a note about the feature in the changelog.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Michael Niedermayer 2013-04-26 03:44:05 +02:00 • committed by Martin Storsjö
parent d8b9dbe776
commit 728214992e
4 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
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:

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;

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

2
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, \