[FFmpeg-cvslog] r17225 - in trunk/libavcodec: Makefile vdpau.c vdpau.h vdpau_pixfmt.h xvmc.c xvmc.h xvmc_pixfmt.h

[diego]

Author: diego
Date: Sat Feb 14 14:37:18 2009
New Revision: 17225

Log:
Revert adding a _pixfmt to vdpau/xvmc header names.
Since vdpau.h was an installed header this would break API.

Added:
   trunk/libavcodec/vdpau.h
      - copied unchanged from r17224, trunk/libavcodec/vdpau_pixfmt.h
   trunk/libavcodec/xvmc.h
      - copied unchanged from r17224, trunk/libavcodec/xvmc_pixfmt.h
Deleted:
   trunk/libavcodec/vdpau_pixfmt.h
   trunk/libavcodec/xvmc_pixfmt.h
Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/vdpau.c
   trunk/libavcodec/xvmc.c

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Sat Feb 14 14:12:49 2009	(r17224)
+++ trunk/libavcodec/Makefile	Sat Feb 14 14:37:18 2009	(r17225)
@@ -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                                                   \

Modified: trunk/libavcodec/vdpau.c
==============================================================================
--- trunk/libavcodec/vdpau.c	Sat Feb 14 14:12:49 2009	(r17224)
+++ trunk/libavcodec/vdpau.c	Sat Feb 14 14:37:18 2009	(r17225)
@@ -29,7 +29,7 @@
 #undef NDEBUG
 #include <assert.h>
 
-#include "vdpau_pixfmt.h"
+#include "vdpau.h"
 #include "vdpau_internal.h"
 
 /**

Modified: trunk/libavcodec/xvmc.c
==============================================================================
--- trunk/libavcodec/xvmc.c	Sat Feb 14 14:12:49 2009	(r17224)
+++ trunk/libavcodec/xvmc.c	Sat Feb 14 14:37:18 2009	(r17225)
@@ -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"