diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-05-05 08:26:50 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-05 20:09:44 +0200 |
| commit | ed68fccf76b489c64814a481bee16ac7fe717c24 (patch) | |
| tree | 65fd73d759a5f91917f175681945acca21facfba | |
| parent | 9d4fdfe24c731d1880797dee65365154b41c1dea (diff) | |
| download | ffmpeg-ed68fccf76b489c64814a481bee16ac7fe717c24.tar.gz | |
vp9: error out if chroma subsampling changes between frames.
This can happen after an intra-only frame. For reference, see:
https://groups.google.com/a/webmproject.org/forum/#!msg/webm-discuss/zaoTxREZjq8/v5Enht87AhcJ
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vp9.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index c2ac997970..71057f35ba 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -31,6 +31,7 @@ #include "vp9data.h" #include "vp9dsp.h" #include "libavutil/avassert.h" +#include "libavutil/pixdesc.h" #define VP9_SYNCCODE 0x498342 @@ -641,7 +642,13 @@ static int decode_frame_header(AVCodecContext *ctx, AVFrame *ref = s->refs[s->refidx[i]].f; int refw = ref->width, refh = ref->height; - if (refw == w && refh == h) { + if (ref->format != fmt) { + av_log(ctx, AV_LOG_ERROR, + "Ref pixfmt (%s) did not match current frame (%s)", + av_get_pix_fmt_name(ref->format), + av_get_pix_fmt_name(fmt)); + return AVERROR_INVALIDDATA; + } else if (refw == w && refh == h) { s->mvscale[i][0] = s->mvscale[i][1] = 0; } else { if (w * 2 < refw || h * 2 < refh || w > 16 * refw || h > 16 * refh) { |