Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 09:37:09 +0000 (11:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 09:42:03 +0000 (11:42 +0200)
commit85f8a3cb50c3950acc8d9854880cf620c60667a5
treecf236abea4a3195ce262731a081316e759edeb67
parent8310bccc91168b499ebedbeb8a63099ca3424b0a
parente208e6d209728d332343aa5390ae377ac0a6305c
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: 90ca5a9b5fc3f1484c389a44f40ee1af4b8f435e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavutil/version.h