Merge commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 12:06:25 +0000 (13:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 12:06:25 +0000 (13:06 +0100)
commitd7aaeea5402c81c83960080c5e6086560a962419
tree407a243c65efa33260c8f4994339f15497fece92
parentddb9a24a7f11c448263ef9b163e8425832cb089c
parentc220a60f92dde9c7c118fc4deddff5c1f617cda9
Merge commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9'

* commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9':
  vdpau: add helper for surface chroma type and size

Conflicts:
libavcodec/vdpau.c
libavcodec/version.h

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