Revert adding a _pixfmt to vdpau/xvmc header names.
authorDiego Biurrun <diego@biurrun.de>
Sat, 14 Feb 2009 13:37:18 +0000 (13:37 +0000)
committerDiego Biurrun <diego@biurrun.de>
Sat, 14 Feb 2009 13:37:18 +0000 (13:37 +0000)
Since vdpau.h was an installed header this would break API.

Originally committed as revision 17225 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/Makefile
libavcodec/vdpau.c
libavcodec/vdpau.h [moved from libavcodec/vdpau_pixfmt.h with 100% similarity]
libavcodec/xvmc.c
libavcodec/xvmc.h [moved from libavcodec/xvmc_pixfmt.h with 100% similarity]

index 06e72b2..f17b96d 100644 (file)
@@ -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                                                   \
index fe583f7..8eb806a 100644 (file)
@@ -29,7 +29,7 @@
 #undef NDEBUG
 #include <assert.h>
 
-#include "vdpau_pixfmt.h"
+#include "vdpau.h"
 #include "vdpau_internal.h"
 
 /**
similarity index 100%
rename from libavcodec/vdpau_pixfmt.h
rename to libavcodec/vdpau.h
index 03ac35c..ca01b9a 100644 (file)
 #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"
 
similarity index 100%
rename from libavcodec/xvmc_pixfmt.h
rename to libavcodec/xvmc.h