From fd949a63538ac2f9fddd239154cc9b0fd2287b79 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 14 Feb 2009 13:37:18 +0000 Subject: [PATCH] Revert adding a _pixfmt to vdpau/xvmc header names. 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 | 2 +- libavcodec/vdpau.c | 2 +- libavcodec/{vdpau_pixfmt.h => vdpau.h} | 0 libavcodec/xvmc.c | 4 ++-- libavcodec/{xvmc_pixfmt.h => xvmc.h} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename libavcodec/{vdpau_pixfmt.h => vdpau.h} (100%) rename libavcodec/{xvmc_pixfmt.h => xvmc.h} (100%) 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 -#include "vdpau_pixfmt.h" +#include "vdpau.h" #include "vdpau_internal.h" /** diff --git a/libavcodec/vdpau_pixfmt.h b/libavcodec/vdpau.h similarity index 100% rename from libavcodec/vdpau_pixfmt.h rename to 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 -//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 similarity index 100% rename from libavcodec/xvmc_pixfmt.h rename to libavcodec/xvmc.h