Michael Niedermayer
4c8bc6fdee
Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'
* commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5':
avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/raw.c
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 21:48:00 +02:00
..
2014-08-03 19:18:25 +02:00
2014-08-04 21:48:00 +02:00
2014-06-18 12:59:15 -08:00
2014-06-25 01:00:05 +02:00
2014-06-20 12:12:46 +02:00
2014-07-27 13:46:48 -08:00
2014-07-20 02:01:50 +02:00
2014-04-29 13:25:59 +02:00
2014-07-08 02:08:04 +02:00
2014-07-08 00:43:18 +02:00
2014-07-20 23:58:36 +02:00
2014-06-03 10:58:19 -08:00
2014-06-30 15:36:26 +02:00
2014-05-23 23:30:21 +02:00
2014-07-30 19:23:08 +02:00
2014-08-03 11:27:27 +02:00
2014-06-14 22:54:32 +02:00
2014-08-01 16:39:28 +02:00
2014-08-04 13:33:44 +02:00
2014-07-31 15:00:41 -08:00
2014-07-20 20:57:53 +02:00
2014-04-12 14:34:11 +02:00
2014-07-08 02:11:19 +02:00
2014-07-17 02:35:56 +02:00
2014-05-29 01:13:59 +02:00
2014-07-01 15:22:11 +02:00
2014-05-28 03:52:50 +02:00
2014-07-22 02:45:45 +02:00
2014-08-04 14:14:13 +02:00
2014-07-20 01:51:28 +02:00
2014-07-20 01:51:28 +02:00
2014-04-09 04:26:20 +02:00
2014-07-17 11:29:01 +02:00
2014-05-26 21:28:19 +02:00