virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

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

Browse Source 
It is supposed to be height * linesize, not width * linesize.
Thanks to Hendrik Leppkes for pointing out the bug.
This commit is contained in:
Anton Khirnov
2013-03-16 18:09:17 +01:00
parent 23f4c5acc4
commit 6552808014
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/utils.c
View File

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

4
libavfilter/buffersrc.c
View File

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