Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 11:54:05 +0000 (13:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 11:54:05 +0000 (13:54 +0200)
* commit '549294fbbe1c00fee37dc4d3f291b98945e11094':
  vdpau: deprecate VDPAU codec capability

Conflicts:
libavcodec/version.h

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

diff --cc doc/APIchanges
Simple merge
Simple merge
@@@ -147,12 -144,8 +147,13 @@@ struct vdpau_render_state 
      int bitstream_buffers_used;
      /** The user is responsible for freeing this buffer using av_freep(). */
      VdpBitstreamBuffer *bitstream_buffers;
 +
 +#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
 +    /** picture parameter information for all supported codecs */
 +    union AVVDPAUPictureInfo info;
 +#endif
  };
+ #endif
  
  /* @}*/
  
   * Libavcodec version macros.
   */
  
 +#include "libavutil/avutil.h"
 +
  #define LIBAVCODEC_VERSION_MAJOR 55
- #define LIBAVCODEC_VERSION_MINOR  20
 -#define LIBAVCODEC_VERSION_MINOR 12
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR  21
 +#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \