Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff'

* commit '728c4658563dc82115ade0f1679679eddb7be5ff':
  vdpau: add a constructor for AVVDPAUContext.

Conflicts:
	libavcodec/vdpau.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-14 13:08:36 +01:00
3 changed files with 19 additions and 1 deletions
+2
View File
@@ -17,6 +17,8 @@ API changes, most recent first:
2013-11-xx - xxxxxxx - lavc 55.26.0 - vdpau.h
Add av_vdpau_get_profile().
Add av_vdpau_alloc_context(). This function must from now on be
used for allocating AVVDPAUContext.
2013-11-xx - xxxxxxx - lavc 55.41.100 / 55.25.0 - avcodec.h
lavu 52.51.100 - frame.h