summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/vdpau.c2
-rw-r--r--libavcodec/vdpau_pixfmt.h (renamed from libavcodec/vdpau.h)0
-rw-r--r--libavcodec/xvmc.c4
-rw-r--r--libavcodec/xvmc_pixfmt.h (renamed from libavcodec/xvmc_render.h)0
4 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 8eb806a1a0..fe583f765f 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -29,7 +29,7 @@
#undef NDEBUG
#include <assert.h>
-#include "vdpau.h"
+#include "vdpau_pixfmt.h"
#include "vdpau_internal.h"
/**
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau_pixfmt.h
index 53dbd7c02a..53dbd7c02a 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau_pixfmt.h
diff --git a/libavcodec/xvmc.c b/libavcodec/xvmc.c
index b66320a61f..03ac35ce9f 100644
--- a/libavcodec/xvmc.c
+++ b/libavcodec/xvmc.c
@@ -29,11 +29,11 @@
#undef NDEBUG
#include <assert.h>
-//X11 includes are in xvmc_render.h
+//X11 includes are in xvmc_pixfmt.h
//by replacing it with non-X one
//XvMC emulation could be performed
-#include "xvmc_render.h"
+#include "xvmc_pixfmt.h"
//#include "xvmc_debug.h"
diff --git a/libavcodec/xvmc_render.h b/libavcodec/xvmc_pixfmt.h
index d9aa154f8f..d9aa154f8f 100644
--- a/libavcodec/xvmc_render.h
+++ b/libavcodec/xvmc_pixfmt.h