diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-17 12:58:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-17 12:59:04 +0100 |
| commit | 171bd38edad5e7057a2a251e07a0547ad708a718 (patch) | |
| tree | 18200e08cf7b712e8c5b9d91a6d968eaf2da5cfe /libavfilter/buffersrc.c | |
| parent | ac1cea55ad0f2c98c5ba7f082c56e2211711e421 (diff) | |
| parent | 6552808014ae318c8feaa8effac6ee40ea6019ce (diff) | |
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>
Diffstat (limited to 'libavfilter/buffersrc.c')
| -rw-r--r-- | libavfilter/buffersrc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 54a58fe1e9..70da5296d9 100644 --- a/libavfilter/buffersrc.c +++ b/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); } |