Revert "Merge commit of 'vdpau: remove old-style decoders'"

This reverts commit bf36dc50ea, reversing
changes made to b7fc2693c7.

Conflicts:

	libavcodec/h264.c

Keeping support for the old VDPAU API has been requested by our VDPAU maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-17 15:31:14 +02:00
parent 0a141b0e49
commit a0c6c8e53e
13 changed files with 552 additions and 4 deletions
+1
View File
@@ -39,6 +39,7 @@
#include "mpeg12.h"
#include "mpeg12data.h"
#include "bytestream.h"
#include "vdpau_internal.h"
#include "xvmc_internal.h"
#include "thread.h"