diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:25:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:25:26 +0200 |
| commit | c3b29023207850fa3b5b6b4dcb8e4940b86abb83 (patch) | |
| tree | 36d9ce6c2f8647b333e7cc025d39074ae00c8480 /libavcodec/Makefile | |
| parent | 50fb8c1114b9c2b7d299cbc17a18a457d12069a8 (diff) | |
| parent | 2852740e23f91d6775714d7cc29b9a73e1111ce0 (diff) | |
Merge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0'
* commit '2852740e23f91d6775714d7cc29b9a73e1111ce0':
vdpau: store picture data in picture's rather than codec's context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2a90bbe10d..45d3d34ae5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -806,7 +806,7 @@ SKIPHEADERS-$(CONFIG_LIBUTVIDEO) += libutvideo.h 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 TESTPROGS = cabac \ dct \ |