Merge commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 20:45:24 +0000 (21:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 20:45:24 +0000 (21:45 +0100)
* commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806':
  swscale: fix stride used in planarToNv12Wrapper()

Conflicts:
libswscale/swscale_unscaled.c

See: 94d7ca2b58af13c379d90aad595e82448743abc7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge