Michael Niedermayer 5f231d909f Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118' ...

* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118':
  vdpau: add a convenience function for getting a decoder profile.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-11-14 13:00:10 +01:00

66 KiB

Raw Blame History

View Raw