Browse Source

lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers

It is supposed to be height * linesize, not width * linesize.
Thanks to Hendrik Leppkes for pointing out the bug.
tags/n2.0
Anton Khirnov 13 years ago
parent
commit
6552808014
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      libavcodec/utils.c
  2. +2
    -2
      libavfilter/buffersrc.c

+ 2
- 2
libavcodec/utils.c View File

@@ -667,8 +667,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);
}


+ 2
- 2
libavfilter/buffersrc.c View File

@@ -193,8 +193,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);
}


Loading…
Cancel
Save