Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff'

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

Conflicts:
	libavcodec/vdpau.h

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

diff --cc doc/APIchanges
index 3a5e5b6,e791443..953a38d
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -17,9 -15,10 +17,11 @@@ 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.25.0 - avcodec.h
 +2013-11-xx - xxxxxxx - lavc 55.41.100 / 55.25.0 - avcodec.h
 +                       lavu 52.51.100 - frame.h
    Add ITU-R BT.2020 and other not yet included values to color primaries,
    transfer characteristics and colorspaces.
  

diff --cc libavcodec/vdpau.c
index b848174,d8a35ee..0eebb9c
--- 1/libavcodec/vdpau.c
--- 2/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@@ -38,13 -38,6 +38,13 @@@
   * @{
   */
  
-     return av_mallocz(sizeof(AVVDPAUContext));
 +AVVDPAUContext *av_alloc_vdpaucontext(void)
 +{
++    return av_vdpau_alloc_context();
 +}
 +
 +MAKE_ACCESSORS(AVVDPAUContext, vdpau_hwaccel, AVVDPAU_Render2, render2)
 +
  int ff_vdpau_common_start_frame(Picture *pic,
                                  av_unused const uint8_t *buffer,
                                  av_unused uint32_t size)

diff --cc libavcodec/vdpau.h
index b84bdea,75cb1bf..e25cc42
--- 1/libavcodec/vdpau.h
--- 2/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@@ -136,16 -131,13 +140,23 @@@ typedef struct AVVDPAUContext 
  } AVVDPAUContext;
  
  /**
 + * @brief allocation function for AVVDPAUContext
 + *
 + * Allows extending the struct without breaking API/ABI
 + */
 +AVVDPAUContext *av_alloc_vdpaucontext(void);
 +
 +AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
 +void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
 +
 +/**
+  * Allocate an AVVDPAUContext.
+  *
+  * @return Newly-allocated AVVDPAUContext or NULL on failure.
+  */
+ AVVDPAUContext *av_vdpau_alloc_context(void);
+ 
+ /**
   * Get a decoder profile that should be used for initializing a VDPAU decoder.
   * Should be called from the AVCodecContext.get_format() callback.
   *