Merge commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806'

Browse Source

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

Conflicts:
	libswscale/swscale_unscaled.c

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

...

This commit is contained in:

Michael Niedermayer 2014-01-21 21:45:24 +01:00

parent 8a77baae6e eb01a25fe1

commit 797d807869

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available