[FFmpeg-cvslog] vp9: error out if chroma subsampling changes between frames.

[Ronald S. Bultje]

ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Tue May  5 08:26:50 2015 -0400| [ed68fccf76b489c64814a481bee16ac7fe717c24] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed68fccf76b489c64814a481bee16ac7fe717c24
---

 libavcodec/vp9.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index c2ac997..71057f3 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) {