virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

vf_interlace: better handling of odd video size

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Michael Niedermayer
2013-07-09 17:57:49 +02:00
committed by Martin Storsjö
parent 52ea298670
commit bec509db43
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_interlace.c
View File

@@ -126,14 +126,14 @@ static void copy_picture_field(AVFrame *src_frame, AVFrame *dst_frame,
int plane, i, j; int plane, i, j;
for (plane = 0; plane < desc->nb_components; plane++) { for (plane = 0; plane < desc->nb_components; plane++) {
int lines = (plane == 1 || plane == 2) ? inlink->h >> vsub : inlink->h; int lines = (plane == 1 || plane == 2) ? -(-inlink->h) >> vsub : inlink->h;
int linesize = av_image_get_linesize(inlink->format, inlink->w, plane); int linesize = av_image_get_linesize(inlink->format, inlink->w, plane);
uint8_t *dstp = dst_frame->data[plane]; uint8_t *dstp = dst_frame->data[plane];
const uint8_t *srcp = src_frame->data[plane]; const uint8_t *srcp = src_frame->data[plane];
av_assert0(linesize >= 0); av_assert0(linesize >= 0);
lines /= 2; lines = (lines + (field_type == FIELD_UPPER)) / 2;
if (field_type == FIELD_LOWER) if (field_type == FIELD_LOWER)
srcp += src_frame->linesize[plane]; srcp += src_frame->linesize[plane];
if (field_type == FIELD_LOWER) if (field_type == FIELD_LOWER)