diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 13:51:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 13:51:20 +0100 |
| commit | 593f5c0f3c559a558efcb10a955cbac499e1fdbb (patch) | |
| tree | 82ce1769739747df73b922d4bf4ffb903060db5c /libavcodec/vp6.c | |
| parent | 5c78a8129c4bac2ae0c12d90672799325bc01e96 (diff) | |
| parent | 8083332c2de9ee189f96844ff4c2d9be1844116f (diff) | |
| download | ffmpeg-593f5c0f3c559a558efcb10a955cbac499e1fdbb.tar.gz | |
Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'
* commit '8083332c2de9ee189f96844ff4c2d9be1844116f':
asyncts: use clipped delta value when setting resample compensation
asyncts: fix flushing of final samples at EOF
vp6: properly fail on unsupported feature
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp6.c')
| -rw-r--r-- | libavcodec/vp6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index bafa2b4d0a..bf168c886e 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -63,8 +63,8 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) return 0; s->filter_header = buf[1] & 0x06; if (buf[1] & 1) { - av_log(s->avctx, AV_LOG_ERROR, "interlacing not supported\n"); - return 0; + av_log_missing_feature(s->avctx, "Interlacing", 0); + return AVERROR_PATCHWELCOME; } if (separated_coeff || !s->filter_header) { coeff_offset = AV_RB16(buf+2) - 2; |