Michael Niedermayer d7aaeea540 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>
2014-12-27 13:06:25 +01:00
..
2014-12-01 00:31:06 +01:00
2014-07-20 02:01:50 +02:00
2014-12-01 00:31:06 +01:00
2014-10-22 23:12:38 +02:00
2014-12-01 00:31:06 +01:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2014-11-22 02:09:09 +01:00
2014-12-06 02:48:17 +01:00
2014-07-17 11:29:01 +02:00