Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:30:49 +0000 (14:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:30:49 +0000 (14:30 +0200)
* commit 'f824535a4a79c260b59d3178b8d958217caffd78':
  vdpau: deprecate bitstream buffers within the hardware context

Conflicts:
libavcodec/version.h

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

diff --cc doc/APIchanges
Simple merge
  
  #include <vdpau/vdpau.h>
  #include <vdpau/vdpau_x11.h>
 +#include "libavutil/avconfig.h"
 +
 +#ifndef FF_API_CAP_VDPAU
 +#define FF_API_CAP_VDPAU 1
 +#endif
  
+ #if FF_API_BUFS_VDPAU
  union AVVDPAUPictureInfo {
      VdpPictureInfoH264        h264;
      VdpPictureInfoMPEG1Or2    mpeg;
Simple merge
   * Libavcodec version macros.
   */
  
 +#include "libavutil/avutil.h"
 +
  #define LIBAVCODEC_VERSION_MAJOR 55
- #define LIBAVCODEC_VERSION_MINOR  21
 -#define LIBAVCODEC_VERSION_MINOR 13
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR  22
 +#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \