From a0c6c8e53ebc32cebcc0182e514cecc6eb30c8a7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 17 Aug 2013 15:31:14 +0200 Subject: Revert "Merge commit of 'vdpau: remove old-style decoders'" This reverts commit bf36dc50ea448999c8f8c7a35f6139a7040f6275, reversing changes made to b7fc2693c70fe72936e4ce124c802ac23857c476. Conflicts: libavcodec/h264.c Keeping support for the old VDPAU API has been requested by our VDPAU maintainer Signed-off-by: Michael Niedermayer --- libavcodec/mpeg12.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libavcodec/mpeg12.c') diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 184f953..dad3d4c 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -39,6 +39,7 @@ #include "mpeg12.h" #include "mpeg12data.h" #include "bytestream.h" +#include "vdpau_internal.h" #include "xvmc_internal.h" #include "thread.h" -- cgit v1.1