Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/utils.c

@@ -762,8 +762,8 @@ do {                                                                    \
             planes = (desc->flags & PIX_FMT_PLANAR) ? desc->nb_components : 1;
 
             for (i = 0; i < planes; i++) {
-                int h_shift    = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
-                int plane_size = (frame->width >> h_shift) * frame->linesize[i];
+                int v_shift    = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
+                int plane_size = (frame->height >> v_shift) * frame->linesize[i];
 
                 WRAP_PLANE(frame->buf[i], frame->data[i], plane_size);
             }

libavfilter/buffersrc.c

@@ -232,8 +232,8 @@ do {                                                                    \
         planes = (desc->flags & PIX_FMT_PLANAR) ? desc->nb_components : 1;
 
         for (i = 0; i < planes; i++) {
-            int h_shift    = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
-            int plane_size = (frame->width >> h_shift) * frame->linesize[i];
+            int v_shift    = (i == 1 || i == 2) ? desc->log2_chroma_w : 0;
+            int plane_size = (frame->height >> v_shift) * frame->linesize[i];
 
             WRAP_PLANE(frame->buf[i], frame->data[i], plane_size);
         }