Merge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:25:08 +0000 (14:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:25:26 +0000 (14:25 +0200)
* commit '2852740e23f91d6775714d7cc29b9a73e1111ce0':
  vdpau: store picture data in picture's rather than codec's context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/Makefile
libavcodec/vdpau.c
libavcodec/vdpau_h264.c
libavcodec/vdpau_internal.h
libavcodec/vdpau_mpeg12.c
libavcodec/vdpau_mpeg4.c
libavcodec/vdpau_vc1.c

@@@ -806,24 -680,19 +806,24 @@@ SKIPHEADERS-$(CONFIG_LIBUTVIDEO)       
  SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
  SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
  SKIPHEADERS-$(CONFIG_VDA)              += vda.h
- SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h
+ SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
  
 -EXAMPLES = api
 -
 -TESTPROGS = dct                                                         \
 +TESTPROGS = cabac                                                       \
 +            dct                                                         \
              fft                                                         \
              fft-fixed                                                   \
 +            fft-fixed32                                                 \
              golomb                                                      \
              iirfilter                                                   \
 +            imgconvert                                                  \
              rangecoder                                                  \
 +            snowenc                                                     \
  
 +TESTPROGS-$(HAVE_MMX) += motion
  TESTOBJS = dctref.o
  
 +TOOLS = fourcc2pixfmt
 +
  HOSTPROGS = aac_tablegen                                                \
              aacps_tablegen                                              \
              cbrt_tablegen                                               \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge