lavc/qsvenc: fix the hard code of height aligment checking

lizhong1008 · lizhong1008 · commit c49ac0b3bd49 · 2018-03-26T17:18:07.000+08:00
Signed-off-by: Zhong Li &lt;zhong.li@intel.com&gt;
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
@@ -1114,7 +1114,7 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame,
         }
     } else {
         /* make a copy if the input is not padded as libmfx requires */
-        if (frame->height & 31 || frame->linesize[0] & (q->width_align - 1)) {
+        if (frame->height & (q->height_align - 1) || frame->linesize[0] & (q->width_align - 1)) {
             qf->frame->height = FFALIGN(frame->height, q->height_align);
             qf->frame->width  = FFALIGN(frame->width, q->width_align);
 

Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,7 @@ static int submit_frame(QSVEncContext q, const AVFrame frame,`
`1114`	`1114`	`}`
`1115`	`1115`	`} else {`
`1116`	`1116`	`/* make a copy if the input is not padded as libmfx requires */`
`1117`		`- if (frame->height & 31 \|\| frame->linesize[0] & (q->width_align - 1)) {`
	`1117`	`+ if (frame->height & (q->height_align - 1) \|\| frame->linesize[0] & (q->width_align - 1)) {`
`1118`	`1118`	`qf->frame->height = FFALIGN(frame->height, q->height_align);`
`1119`	`1119`	`qf->frame->width = FFALIGN(frame->width, q->width_align);`
`1120`	`1120`