Commit 797d8078 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'eb01a25f'

* commit 'eb01a25f':
  swscale: fix stride used in planarToNv12Wrapper()

Conflicts:
	libswscale/swscale_unscaled.c

See: 94d7ca2bMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8a77baae eb01a25f
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment