← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to hw/xfree86/common/xf86xvmc.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/common/xf86xvmc.c
48
48
#include "xf86xvpriv.h"
49
49
#include "xf86xvmc.h"
50
50
 
 
51
typedef int (*XvMCScreenInitProcPtr)(ScreenPtr, int, XvMCAdaptorPtr);
51
52
#ifdef XFree86LOADER
52
 
int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr) = NULL;
 
53
_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = NULL;
53
54
#else
54
 
int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr) = XvMCScreenInit;
 
55
_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = XvMCScreenInit;
55
56
#endif
56
57
 
57
58
 
162
163
    return (*pScreen->CloseScreen)(i, pScreen);
163
164
}
164
165
 
165
 
Bool xf86XvMCScreenInit(
 
166
_X_EXPORT Bool xf86XvMCScreenInit(
166
167
   ScreenPtr pScreen, 
167
168
   int num_adaptors,
168
169
   XF86MCAdaptorPtr *adaptors
232
233
   return TRUE;
233
234
}
234
235
 
235
 
XF86MCAdaptorPtr xf86XvMCCreateAdaptorRec (void)
 
236
_X_EXPORT XF86MCAdaptorPtr xf86XvMCCreateAdaptorRec (void)
236
237
{
237
238
   return xcalloc(1, sizeof(XF86MCAdaptorRec));
238
239
}
239
240
 
240
 
void xf86XvMCDestroyAdaptorRec(XF86MCAdaptorPtr adaptor)
 
241
_X_EXPORT void xf86XvMCDestroyAdaptorRec(XF86MCAdaptorPtr adaptor)
241
242
{
242
243
   xfree(adaptor);
243
244
}