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
..
2014-07-20 02:01:50 +02:00
2014-07-20 23:58:36 +02:00
2014-06-03 10:58:19 -08:00
2014-05-23 23:30:21 +02:00
2014-08-04 13:33:44 +02:00
2014-07-08 02:11:19 +02:00
2014-05-28 03:52:50 +02:00
2013-08-29 22:52:04 +02:00
2013-02-14 23:45:48 +01:00
2014-07-17 11:29:01 +02:00