libswscale/swscale-test.c · 32c712f1437b7f3db889cec19dcb53f757a1dea6 · libremedia / Tethys / FFmpeg

10 years ago

Michael Niedermayer authored 10 years ago


* commit 'f84a1b59':
  swscale: support AV_PIX_FMT_YA16 as input

Conflicts:
	libswscale/swscale_unscaled.c

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

2f5bf2f7

History

Merge commit ''

Michael Niedermayer authored 10 years ago


* commit 'f84a1b59':
  swscale: support AV_PIX_FMT_YA16 as input

Conflicts:
	libswscale/swscale_unscaled.c

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

swscale-test.c 13.71 KiB