[FFmpeg-devel] [PATCH] libavcodec/qsvenc.c: Fix for too agressive height alignment during frame encoding which may be reason of superflous frame copying.

[Michael Niedermayer]

On Thu, Jul 09, 2015 at 02:24:43PM +0300, Ivan Uskov wrote:
> Hello All,
> 
> There is another place into libavcodec/qsvenc.c where height may be
> aligned to 32 for the case when alignment to 16 is enough. It can be
> reason of superfluous frame copying. The attached patch does solve
> this issue. Please review.

does not apply cleanly

Applying: libavcodec/qsvenc.c: Fix for too agressive height alignment during frame encoding which may be reason of superflous frame copying.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging libavcodec/qsvenc.h
Auto-merging libavcodec/qsvenc.c
CONFLICT (content): Merge conflict in libavcodec/qsvenc.c
Failed to merge in the changes.
Patch failed at 0001 libavcodec/qsvenc.c: Fix for too agressive height alignment during frame encoding which may be reason of superflous frame copying.

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you think the mosad wants you dead since a long time then you are either
wrong or dead since a long time.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150709/ba9fcf08/attachment.sig>