summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/vdpau.c2
-rw-r--r--libavcodec/vdpau.h (renamed from libavcodec/vdpau_pixfmt.h)0
-rw-r--r--libavcodec/xvmc.c4
-rw-r--r--libavcodec/xvmc.h (renamed from libavcodec/xvmc_pixfmt.h)0
5 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 06e72b2fe9..f17b96d12e 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -3,7 +3,7 @@ include $(SUBDIR)../config.mak
NAME = avcodec
FFLIBS = avutil
-HEADERS = avcodec.h opt.h vdpau_pixfmt.h
+HEADERS = avcodec.h opt.h vdpau.h
OBJS = allcodecs.o \
audioconvert.o \
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index fe583f765f..8eb806a1a0 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -29,7 +29,7 @@
#undef NDEBUG
#include <assert.h>
-#include "vdpau_pixfmt.h"
+#include "vdpau.h"
#include "vdpau_internal.h"
/**
diff --git a/libavcodec/vdpau_pixfmt.h b/libavcodec/vdpau.h
index 53dbd7c02a..53dbd7c02a 100644
--- a/libavcodec/vdpau_pixfmt.h
+++ b/libavcodec/vdpau.h
diff --git a/libavcodec/xvmc.c b/libavcodec/xvmc.c
index 03ac35ce9f..ca01b9adea 100644
--- a/libavcodec/xvmc.c
+++ b/libavcodec/xvmc.c
@@ -29,11 +29,11 @@
#undef NDEBUG
#include <assert.h>
-//X11 includes are in xvmc_pixfmt.h
+//X11 includes are in libavcodec/xvmc.h
//by replacing it with non-X one
//XvMC emulation could be performed
-#include "xvmc_pixfmt.h"
+#include "xvmc.h"
//#include "xvmc_debug.h"
diff --git a/libavcodec/xvmc_pixfmt.h b/libavcodec/xvmc.h
index d9aa154f8f..d9aa154f8f 100644
--- a/libavcodec/xvmc_pixfmt.h
+++ b/libavcodec/xvmc.h