Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 19:24:24 +0000 (21:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 19:32:03 +0000 (21:32 +0200)
commit073c074447c253111790c0472fb83f184e66814e
tree860cb3c06dc2928f2a6daa5086cc60f3cd3b7180
parent8862c49661fb0655882a78547ca70561f2c5d766
parentd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26
Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'

* commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26':
  pixdesc: Support pixelformat aliases

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

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