1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavutil
Michael Niedermayer 6b1ca1709f Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
* commit '1481d24c3a0abf81e1d7a514547bd5305232be30':
  RGBA64 pixel formats

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/utils.c

See: 9569a3c9f41387a8c7d1ce97d8693520477a66c3
See: 92afb431621c79155fcb7171d26f137eb1bee028, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 14:41:13 +01:00
..
2013-12-11 21:13:51 +01:00
2013-12-22 22:25:15 +01:00
2014-01-05 21:55:58 +01:00
2013-11-04 15:38:52 +01:00
2014-01-26 02:23:26 +01:00
2014-03-03 23:34:31 +01:00
2014-03-03 23:34:31 +01:00
2014-01-19 17:12:22 +01:00
2013-11-22 17:16:11 +01:00
2013-11-03 00:59:38 +01:00
2013-11-03 00:59:38 +01:00