~ubuntu-branches/ubuntu/utopic/mupen64plus-video-rice/utopic

« back to all changes in this revision

Viewing changes to src/DirectXDecodedMux.cpp

  • Committer: Package Import Robot
  • Author(s): Sven Eckelmann
  • Date: 2012-03-17 20:18:37 UTC
  • mfrom: (1.2.1) (3.1.2 experimental)
  • Revision ID: package-import@ubuntu.com-20120317201837-wo2mkgadhlyw9yrl
Tags: 1.99.5-1
* New Upstream Version
* Enable all hardening flags in debian/rules
* Upgraded to policy 3.9.3, no changes required
* Upgrade debhelper compat to v9
* Use buildflags.mk to set security flags in debian/rules
* Update debian/copyright

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
#include "DirectXDecodedMux.h"
21
21
#include <algorithm>
22
22
 
 
23
#ifdef min
 
24
#undef min
 
25
#endif
 
26
#ifdef max
 
27
#undef max
 
28
#endif
 
29
 
23
30
//This function is called after Reformat to handel two texels in 1 cycle, D3D can not handle
24
31
//two texels in a single stage, the texels must be splited into multiple stages
25
32
void CDirectXDecodedMux::ReformatAgainWithTwoTexels(void)