Michael Niedermayer 85f8a3cb50 Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c' ...

* commit 'e208e6d209728d332343aa5390ae377ac0a6305c':
  lavu: Add interleaved 4:2:2 8/10-bit formats

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

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

2013-09-22 11:42:03 +02:00

65 KiB

Raw Blame History

View Raw