Michael Niedermayer 6017c98036 Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6' ...

* commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6':
  avutil: add AV_PIX_FMT_YA16 pixel format

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

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

2014-08-04 22:12:24 +02:00

80 KiB

Raw Blame History

View Raw