Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 01:07:47 +0000 (03:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 01:07:47 +0000 (03:07 +0200)
commit0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb
treeac4bfa3f2e2fa0c0a7766633650516e0ac4247ef
parent352e13e2a9914c623fc53fab3ff49a21e9232674
parent8b17243d1742279bcb2368f8d325ea71e66736c8
Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'

* commit '8b17243d1742279bcb2368f8d325ea71e66736c8':
  lavu: Add packed YVYU422 pixel format

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h