Request 3188 (accepted)

Overview

Request 3188 (accepted)

Update to version 2.6.16

Created by enzokiel almost 8 years ago
In state accepted
Package maintainer: enzokiel

Submit avidemux3

Submit package home:enzokiel:...hes:Multimedia / avidemux3 to package Multimedia / avidemux3

avidemux3.changes Changed

@@ -1,4 +1,24 @@
 -------------------------------------------------------------------
+Wed Jan 04 19:23:41 UTC 2017 - joerg.lorenzen@ki.tng.de
+
+- Update to version 2.6.16
+  + Build : Avidemux can be built with visual c++ 2015 (losing
+    some ASM)
+  + OsX : Initialize fontconfig so that subtitling works
+  + Core : Update ffmpeg to 3.0.5
+  + i18n : Updated fr and ru translations
+    (jean Elchinger/totalcaesar659)
+  + Build : Improved build scripts (euma)
+  + x265 : Enforce complicancy with most devices
+  + vaapi : Add resizer
+  + UI : Redone UI, revamped contrast filter
+  + Qt : Dont use too much CPU on playback when there is no audio
+    track
+  + Qt : Reenabled nvenc + Fixed keyframe detection
+  + Qt : Fixed a crash when encoding starts very slowly (x265)
+  + Build : Allow use of system libass, liba52,libmad (euma)
+
+-------------------------------------------------------------------
 Mon Nov 21 20:39:32 UTC 2016 - joerg.lorenzen@ki.tng.de
 
 - Update to version 2.6.15

avidemux3.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package avidemux3
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
-Version:        2.6.15
+Version:        2.6.16
 Release:        1
 Url:            http://avidemux.sourceforge.net/
 Source0:        avidemux_%{version}.tar.gz
@@ -422,6 +422,7 @@
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ascii.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_black.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_blackenBorders.so
@@ -457,10 +458,17 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swapUV.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_telecide.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_unstackField.so
+%if %{with build_qt5}
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.so
+%endif
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_yadif.so
+%dir %{_datadir}/ADM6_addons
+%dir %{_datadir}/ADM6_addons/avsfilter
+%{_datadir}/ADM6_addons/avsfilter/avsload.exe
+%{_datadir}/ADM6_addons/avsfilter/pipe_source.dll
 %{_mandir}/man1/avidemux.1.gz
 %doc AUTHORS COPYING README

avidemux-bootStrap.patch Changed

avidemux_2.6.15.tar.gz/avidemux/cli/ADM_UIs/include/DIA_flyDialogCli.h Deleted

@@ -1,49 +0,0 @@
-/** **************************************************************************
-        \fn DIA_flyDialogQt4.h
- copyright            : (C) 2007 by mean
- email                : fixounet@free.fr
- 
- 
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#ifndef ADM_FLY_DIALOG_CLI_H
-#define ADM_FLY_DIALOG_CLI_H
-
-#include "ADM_UI_Cli6_export.h"
-#include "DIA_flyDialog.h"
-
-class ADM_UI_CLI6_EXPORT ADM_flyDialogCli : public ADM_flyDialog
-{
-public:
-  ADM_flyDialogCli(uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
-                              void *canvas, void *slider, int yuv, ResizeMethod resizeMethod):
-                                ADM_flyDialog(width,height,in,canvas,slider,yuv,resizeMethod) {};
-  virtual           ~ADM_flyDialogCli(void);
-  virtual bool     isRgbInverted(void);
-  virtual uint8_t  display(void);
-  virtual float   calcZoomFactor(void);
-  virtual uint32_t sliderGet(void);
-  virtual uint8_t  sliderSet(uint32_t value);
-  virtual void    postInit(uint8_t reInit);
-  virtual void    setupMenus (const void * params,
-                         const MenuMapping * menu_mapping,
-                        uint32_t menu_mapping_count) ;
-  virtual void  getMenuValues ( void * mm,
-                    const MenuMapping * menu_mapping,
-                    uint32_t menu_mapping_count) ;
-  virtual  const MenuMapping *lookupMenu (const char * widgetName,
-                                               const MenuMapping * menu_mapping,
-                                               uint32_t menu_mapping_count) ;
-  virtual uint32_t  getMenuValue (const MenuMapping * mm) ;          
-};
-
-
-#endif

avidemux_2.6.15.tar.gz/avidemux/cli/ADM_UIs/src/DIA_flyDialogCli.cpp Deleted

@@ -1,84 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2006 by mean
-    email                : fixounet@free.fr
-***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************///
-
-
-
-#include <math.h>
-#include "ADM_default.h"
-#include "ADM_image.h"
-#include "DIA_flyDialog.h"
-#include "DIA_flyDialogCli.h"
-#include "ADM_assert.h"
-
-ADM_flyDialogCli::~ADM_flyDialogCli(void) { }
-
-void ADM_flyDialogCli::postInit(uint8_t reInit)
-{
-}
-
-
-float ADM_flyDialogCli::calcZoomFactor(void)
-{
-        return 0;      
-}
-
-uint8_t  ADM_flyDialogCli::display(void)
-{
-        return 0;      
-}
-
-uint32_t ADM_flyDialogCli::sliderGet(void)
-{
-        return 0;      
-}
-
-uint8_t ADM_flyDialogCli::sliderSet(uint32_t value)
-{
-        return 0;      
-}
-
-bool ADM_flyDialogCli::isRgbInverted(void)
-{
-        return 0; 
-}
-
-void ADM_flyDialogCli::setupMenus (const void * params, 
-                                const MenuMapping * menu_mapping,
-                                uint32_t menu_mapping_count)
-{
-        return ;
-}
-
-uint32_t ADM_flyDialogCli::getMenuValue (const MenuMapping * mm)
-{
-        return 0;
-}
-
-void ADM_flyDialogCli::getMenuValues ( void * params,
-                                   const MenuMapping * menu_mapping,
-                                   uint32_t menu_mapping_count)
-{
-        return ;
-}
-
-const MenuMapping *
-ADM_flyDialogCli::lookupMenu (const char * widgetName,
-                           const MenuMapping * menu_mapping,
-                           uint32_t menu_mapping_count)
-{
-    return 0;
-}
-
-//EOF
-

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_UIs/src/T_flyDialogQt4.cpp Deleted

@@ -1,156 +0,0 @@
-/***************************************************************************
-    \file T_flyDialogQt4.cpp
-    \brief QT4 variabt of fly dialogs
-    \author mean (c) 2006, fixounet@free.fr
-***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************///
-
-
-#include <QtCore/QEvent>
-#include <QtCore/QCoreApplication>
-#include <QGraphicsView>
-#include <QSlider>
-
-#include "ADM_default.h"
-#include "DIA_flyDialog.h"
-#include "DIA_flyDialogQt4.h"
-#include "ADM_toolkitQt.h"
-
-extern float UI_calcZoomToFitScreen(QWidget* window, QWidget* canvas, uint32_t imageWidth, uint32_t imageHeight);
-
-/**
-    \fn    FlyDialogEventFilter
-    \brief
-*/
-
-FlyDialogEventFilter::FlyDialogEventFilter(ADM_flyDialog *flyDialog)
-{
-	recomputed = false;
-	this->flyDialog = flyDialog;
-}
-/**
-    \fn    eventFilter
-    \brief
-*/
-
-bool FlyDialogEventFilter::eventFilter(QObject *obj, QEvent *event)
-{
-	if (event->type() == QEvent::Show && !recomputed)
-	{
-		recomputed = true;
-		QWidget* parent = (QWidget*)obj;
-		uint32_t screenWidth, screenHeight;
-
-		UI_getPhysicalScreenSize(parent, &screenWidth, &screenHeight);
-		flyDialog->recomputeSize();
-		QCoreApplication::processEvents();
-		parent->move((((int)screenWidth) - parent->frameSize().width()) / 2, (((int)screenHeight) - parent->frameSize().height()) / 2);
-	}
-
-	return QObject::eventFilter(obj, event);
-}
-/**
-    \fn    ADM_flyDialog
-    \brief
-*/
-
-  ADM_flyDialogQt4::ADM_flyDialogQt4(uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
-                              void *canvas, void *slider, int yuv, ResizeMethod resizeMethod):
-                                ADM_flyDialog(width,height,in,canvas,slider,yuv,resizeMethod) 
-{
-        EndConstructor();
-}
-/**
-    \fn    postInit
-    \brief
-*/
-
-void ADM_flyDialogQt4::postInit(uint8_t reInit)
-{
-	QWidget *graphicsView = ((ADM_QCanvas*)_canvas)->parentWidget();
-	QSlider  *slider=(QSlider *)_slider;
-
-	if (!reInit)
-	{
-		FlyDialogEventFilter *eventFilter = new FlyDialogEventFilter(this);
-
-		if (slider)
-			slider->setMaximum(ADM_FLY_SLIDER_MAX);
-
-		graphicsView->parentWidget()->installEventFilter(eventFilter);
-	}
-
-	((ADM_QCanvas*)_canvas)->changeSize(_zoomW, _zoomH);
-	graphicsView->setMinimumSize(_zoomW, _zoomH);
-	graphicsView->resize(_zoomW, _zoomH);
-}
-/**
-    \fn    calcZoomFactor
-    \brief
-*/
-
-float ADM_flyDialogQt4::calcZoomFactor(void)
-{
-	return UI_calcZoomToFitScreen(((ADM_QCanvas*)_canvas)->parentWidget()->parentWidget(), ((ADM_QCanvas*)_canvas)->parentWidget(), _w, _h);
-}
-/**
-    \fn    display
-    \brief
-*/
-
-uint8_t  ADM_flyDialogQt4::display(uint8_t *rgbData)
-{
-   ADM_QCanvas *view=(ADM_QCanvas *)_canvas;
-   ADM_assert(view);
-   view->dataBuffer=rgbData;
-   if(!rgbData)
-   {
-      ADM_info("flyDialog: No rgbuffer ??\n"); 
-   } 
-   view->repaint();
-  return 1; 
-}
-/**
-    \fn    sliderGet
-    \brief
-*/
-
-uint32_t ADM_flyDialogQt4::sliderGet(void)
-{
-  QSlider  *slide=(QSlider *)_slider;
-  ADM_assert(slide);
-  return slide->value();
-  
-}
-/**
-    \fn    sliderSet
-    \brief
-*/
-
-uint8_t     ADM_flyDialogQt4::sliderSet(uint32_t value)
-{
-  QSlider  *slide=(QSlider *)_slider;
-  ADM_assert(slide);
-  if(value>ADM_FLY_SLIDER_MAX) value=ADM_FLY_SLIDER_MAX;
-  slide->setValue(value);
-  return 1; 
-}
-/**
-    \fn    isRgbInverted
-    \brief
-*/
-bool  ADM_flyDialogQt4::isRgbInverted(void)
-{
-  return 0; 
-}
-
-
-//EOF

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/src/dirent.c Deleted

@@ -1,232 +0,0 @@
-/*
- * dirent.c
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the mingw-runtime package.
- * No warranty is given; refer to the file DISCLAIMER within the package.
- *
- * Derived from DIRLIB.C by Matt J. Weinstein
- * This note appears in the DIRLIB.H
- * DIRLIB.H by M. J. Weinstein   Released to public domain 1-Jan-89
- *
- * Updated by Jeremy Bettis <jeremy@hksys.com>
- * Significantly revised and rewinddir, seekdir and telldir added by Colin
- * Peters <colin@fu.is.saga-u.ac.jp>
- *	
- */
-
-#define _UNICODE
-
-#include <dirent.h>
-#include <errno.h>
-#include <io.h>
-#include <Windows.h>
-
-#define SUFFIX	_T("*")
-#define	SLASH	_T("\\")
-
-/*
- * opendir
- *
- * Returns a pointer to a DIR structure appropriately filled in to begin
- * searching a directory.
- */
-_TDIR *
-_topendir (const _TCHAR *szPath)
-{
-  _TDIR *nd;
-  unsigned int rc;
-  _TCHAR szFullPath[MAX_PATH];
-
-  errno = 0;
-
-  if (!szPath)
-    {
-      errno = EFAULT;
-      return (_TDIR *) 0;
-    }
-
-  if (szPath[0] == _T('\0'))
-    {
-      errno = ENOTDIR;
-      return (_TDIR *) 0;
-    }
-
-  /* Attempt to determine if the given path really is a directory. */
-  rc = GetFileAttributesW (szPath);
-  if (rc == INVALID_FILE_ATTRIBUTES)
-    {
-      /* call GetLastError for more error info */
-      errno = ENOENT;
-      return (_TDIR *) 0;
-    }
-  if (!(rc & FILE_ATTRIBUTE_DIRECTORY))
-    {
-      /* Error, entry exists but not a directory. */
-      errno = ENOTDIR;
-      return (_TDIR *) 0;
-    }
-
-  /* Make an absolute pathname.  */
-  _tfullpath (szFullPath, szPath, MAX_PATH);
-
-  /* Allocate enough space to store DIR structure and the complete
-   * directory path given. */
-  nd = (_TDIR *) malloc (sizeof (_TDIR) + (_tcslen (szFullPath)
-					   + _tcslen (SLASH)
-					   + _tcslen (SUFFIX) + 1)
-					  * sizeof (_TCHAR));
-
-  if (!nd)
-    {
-      /* Error, out of memory. */
-      errno = ENOMEM;
-      return (_TDIR *) 0;
-    }
-
-  /* Create the search expression. */
-  _tcscpy (nd->dd_name, szFullPath);
-
-  /* Add on a slash if the path does not end with one. */
-  if (nd->dd_name[0] != _T('\0') &&
-      nd->dd_name[_tcslen (nd->dd_name) - 1] != _T('/') &&
-      nd->dd_name[_tcslen (nd->dd_name) - 1] != _T('\\'))
-    {
-      _tcscat (nd->dd_name, SLASH);
-    }
-
-  /* Add on the search pattern */
-  _tcscat (nd->dd_name, SUFFIX);
-
-  /* Initialize handle to -1 so that a premature closedir doesn't try
-   * to call _findclose on it. */
-  nd->dd_handle = -1;
-
-  /* Initialize the status. */
-  nd->dd_stat = 0;
-
-  /* Initialize the dirent structure. ino and reclen are invalid under
-   * Win32, and name simply points at the appropriate part of the
-   * findfirst_t structure. */
-  nd->dd_dir.d_ino = 0;
-  nd->dd_dir.d_reclen = 0;
-  nd->dd_dir.d_namlen = 0;
-  memset (nd->dd_dir.d_name, 0, 260 /*FILENAME_MAX*/);
-
-  return nd;
-}
-
-int
-_tclosedir (_TDIR * dirp)
-{
-  int rc;
-
-  errno = 0;
-  rc = 0;
-
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return -1;
-    }
-
-  if (dirp->dd_handle != -1)
-    {
-      rc = _findclose (dirp->dd_handle);
-    }
-
-  /* Delete the dir structure. */
-  free (dirp);
-
-  return rc;
-}
-
-struct _tdirent *
-_treaddir (_TDIR * dirp)
-{
-  errno = 0;
-
-  /* Check for valid DIR struct. */
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return (struct _tdirent *) 0;
-    }
-
-  if (dirp->dd_stat < 0)
-    {
-      /* We have already returned all files in the directory
-       * (or the structure has an invalid dd_stat). */
-      return (struct _tdirent *) 0;
-    }
-  else if (dirp->dd_stat == 0)
-    {
-      /* We haven't started the search yet. */
-      /* Start the search */
-      dirp->dd_handle = _tfindfirst (dirp->dd_name, &(dirp->dd_dta));
-
-      if (dirp->dd_handle == -1)
-	{
-	  /* Whoops! Seems there are no files in that
-	   * directory. */
-	  dirp->dd_stat = -1;
-	}
-      else
-	{
-	  dirp->dd_stat = 1;
-	}
-    }
-  else
-    {
-      /* Get the next search entry. */
-      if (_tfindnext (dirp->dd_handle, &(dirp->dd_dta)))
-	{
-	  /* We are off the end or otherwise error.
-	     _findnext sets errno to ENOENT if no more file
-	     Undo this. */
-	  DWORD winerr = GetLastError ();
-	  if (winerr == ERROR_NO_MORE_FILES)
-	    errno = 0;
-	  _findclose (dirp->dd_handle);
-	  dirp->dd_handle = -1;
-	  dirp->dd_stat = -1;
-	}
-      else
-	{
-	  /* Update the status to indicate the correct
-	   * number. */
-	  dirp->dd_stat++;
-	}
-    }
-
-  if (dirp->dd_stat > 0)
-    {
-      /* Successfully got an entry. Everything about the file is
-       * already appropriately filled in except the length of the
-       * file name. */
-      dirp->dd_dir.d_namlen = _tcslen (dirp->dd_dta.name);
-      _tcscpy (dirp->dd_dir.d_name, dirp->dd_dta.name);
-      return &dirp->dd_dir;
-    }
-
-  return (struct _tdirent *) 0;
-}
-
-void
-_trewinddir (_TDIR * dirp)
-{
-  errno = 0;
-
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return;
-    }
-
-  if (dirp->dd_handle != -1)
-    {
-      _findclose (dirp->dd_handle);
-    }
-
-  dirp->dd_handle = -1;
-  dirp->dd_stat = 0;
-}
\ No newline at end of file

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDefs/._GNU_C.h Deleted

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDefs/._Strings_Defs.h Deleted

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDefs/._Unknown_C.h Deleted

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDefs/._Visual_C.h Deleted

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSON_Base64.cpp Deleted

@@ -1,101 +0,0 @@
-#include "JSON_Base64.h"
-
-#if defined(JSON_BINARY) || defined(JSON_EXPOSE_BASE64)  //if this is not needed, don't waste space and time compiling it
-
-static const json_char * chars64(JSON_TEXT("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"));
-
-json_string JSONBase64::json_encode64(const unsigned char * binary, size_t bytes) json_nothrow {
-    size_t misaligned = bytes % 3;
-    json_string result;
-    result.reserve((size_t)(((float)bytes) * 1.37f) + 4);
-
-    //do all of the ones that are 3 byte aligned
-    for (size_t i = 0, aligned((bytes - misaligned) / 3); i < aligned; ++i){
-	   result += chars64[(binary[0] & 0xFC) >> 2];
-	   result += chars64[((binary[0] & 0x03) << 4) + ((binary[1] & 0xF0) >> 4)];
-	   result += chars64[((binary[1] & 0x0F) << 2) + ((binary[2] & 0xC0) >> 6)];
-	   result += chars64[binary[2] & 0x3F];
-	   binary += 3;
-    }
-
-    if (json_likely(misaligned != 0)){
-	   //copy the rest into a temporary buffer
-	   unsigned char temp[3];
-	   for (unsigned int i = 0; i < misaligned; ++i){
-		  temp[i] = *binary++;
-	   }
-	   for (unsigned int i = (unsigned int)misaligned; i < 3; ++i){
-		  temp[i] = '\0';
-	   }
-
-	   //now do the final three bytes
-	   result += chars64[(temp[0] & 0xFC) >> 2];
-	   result += chars64[((temp[0] & 0x03) << 4) + ((temp[1] & 0xF0) >> 4)];
-	   if (misaligned == 2){
-		  result += chars64[((temp[1] & 0x0F) << 2) + ((temp[2] & 0xC0) >> 6)];
-		  result += JSON_TEXT('=');
-	   } else {
-		  result += JSON_TEXT("==");
-	   }
-    }
-    JSON_ASSERT((size_t)(((float)bytes) * 1.37f) + 4 >= result.length(), JSON_TEXT("Didn't reserve enough space for a one-time go"));
-    return result;
-}
-
-
-//define it first for the pure qualifier
-
-//generated array initialization.  If there is a bug in toBinary, regenerate this array
-const json_uchar binaryConvert[80] = {62,48,49,50,63,52,53,54,55,56,57,58,59,60,61,249,250,251,252,253,254,255,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
-
-inline json_uchar toBinary(json_uchar c) json_pure;
-inline json_uchar toBinary(json_uchar c) json_nothrow {
-    JSON_ASSERT_SAFE(c >= 43, JSON_TEXT("Encoded outside low range"), return JSON_TEXT('0'););
-    JSON_ASSERT_SAFE(c <= 122, JSON_TEXT("Encoded outside high range"), return JSON_TEXT('0'););
-    return binaryConvert[c - 43];
-}
-
-std::string JSONBase64::json_decode64(const json_string & encoded) json_nothrow {
-    const size_t length = encoded.length();
-    #if defined JSON_DEBUG || defined JSON_SAFE
-	   size_t pos = encoded.find_first_not_of(chars64);
-	   if (json_unlikely(pos != json_string::npos)){
-		  JSON_ASSERT_SAFE(encoded[pos] == JSON_TEXT('='), JSON_TEXT("Not Base64"), return EMPTY_STD_STRING;);
-		  if (pos != length - 1){
-			 JSON_ASSERT_SAFE(pos == length - 2, JSON_TEXT("Not Base64"), return EMPTY_STD_STRING;);
-			 JSON_ASSERT_SAFE(encoded[pos + 1] == JSON_TEXT('='), JSON_TEXT("Not Base64"), return EMPTY_STD_STRING;);
-		  }
-	   }
-    #endif
-    const json_char * runner = encoded.c_str();
-    size_t aligned = length / 4; //don't do the last ones as they might be = padding
-    std::string result;
-    if (json_likely(aligned != 0)){
-	   --aligned;
-	   result.reserve((size_t)((float)length / 1.37) + 1);
-
-	   //first do the ones that can not have any padding
-	   for (unsigned int i = 0; i < aligned; ++i){
-		  const json_char second = toBinary(runner[1]);
-		  const json_char third = toBinary(runner[2]);
-		  result += (toBinary(runner[0]) << 2) + ((second & 0x30) >> 4);
-		  result += ((second & 0xf) << 4) + ((third & 0x3c) >> 2);
-		  result += ((third & 0x3) << 6) + toBinary(runner[3]);
-		  runner += 4;
-	   }
-
-	   //now do the ones that might have padding, the first two characters can not be padding, so do them quickly
-	   const json_char second = toBinary(runner[1]);
-	   result += (toBinary(runner[0]) << 2) + ((second & 0x30) >> 4);
-	   if (runner[2] != '='){  //not two = pads
-		  const json_char third = toBinary(runner[2]);
-		  result += ((second & 0xf) << 4) + ((third & 0x3c) >> 2);
-		  if (runner[3] != '='){  //no padding
-			 result += ((third & 0x3) << 6) + toBinary(runner[3]);
-		  }
-	   }
-    }
-    return result;
-}
-
-#endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoFilter/include/DIA_flyDialog.h Deleted

@@ -1,209 +0,0 @@
-/****************************************************************************
- copyright            : (C) 2007 by mean
- email                : fixounet@free.fr
- 
- Simple class to do filter that have a configuration that have real time effect
- 
- Case 1: The filter process YUV
- 
- YUV-> Process->YUVOUT->YUV2RGB->RGBUFFEROUT
- 
- Case 2: The filter process RGV
- 
- YUV-> YUV2RGB->RGB->Process->RGBUFFEROUT
-
-The ADM_flyDialog implments the common part
-The yuv/rgb specific part is implement through ADM_flyDialogAction (yuv/rgb)
-
- 
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#ifndef ADM_FLY_DIALOG_H
-#define ADM_FLY_DIALOG_H
-
-#include "ADM_coreVideoFilter6_export.h"
-
-#if !defined(ADM_FLY_INTERNAL)
-#if !defined(ADM_UI_TYPE_BUILD)
-#error No ADM_UI_TYPE_BUILD defined
-#endif
-#include "DIA_uiTypes.h"
-
-#if ADM_UI_TYPE_BUILD == ADM_UI_QT4
-        #include <QWidget>
-        #include <QDialog>
-#endif //UI_BUILD_TYPE
-#endif //ADM_FLY_INTERNAL 
-
-#include "ADM_default.h"
-#include "ADM_rgb.h"
-#include "ADM_colorspace.h"
-#include "ADM_coreVideoFilter.h"
-#include "ADM_imageResizer.h"
-#define ADM_FLY_SLIDER_MAX 1000
-
-enum ResizeMethod {
-    RESIZE_NONE = 0,	// No automatic resize
-	RESIZE_AUTO = 1,	// Resize image when convenient (YUV: after filter, RGB: before applying filter)
-	RESIZE_LAST = 2		// Resize image after filter has been applied (slower for RGB)
-};
-
-class diaMenuEntry;  // defined in DIA_factory.h; only need pointer here
-class ADM_flyDialog;
-struct MenuMapping
-{
-    const char * widgetName; // name of the combo box widget or equivalent
-    uint32_t paramOffset;   // offsetof(FOO_PARAM, menu_option_member)
-    uint32_t count;
-    const diaMenuEntry * menu;
-};
-/**
-    \class ADM_flyDialogAction
-*/
-class ADM_flyDialogAction
-{
-protected:
-            ADM_flyDialog *parent;
-            ADM_flyDialogAction(ADM_flyDialog *parent) {this->parent=parent;}
-public:
-  virtual   ~ADM_flyDialogAction() {}
-  virtual    bool process(void)=0;
-  virtual    void resetScaler(void)=0;
-};
-
-class ADM_flyDialogActionYuv: public ADM_flyDialogAction
-{
-protected:
-          ADMImage      *_yuvBufferOut;
-          ADMColorScalerFull *yuvToRgb;
-public:
-            ADM_flyDialogActionYuv(ADM_flyDialog *parent);
-            ~ADM_flyDialogActionYuv();
-        void resetScaler(void);
-        bool process(void);
-};
-
-class ADM_flyDialogActionRgb: public ADM_flyDialogAction
-{
-protected:
-          ADM_byteBuffer     _rgbByteBuffer;
-          ADM_byteBuffer     _rgbByteBufferOut;
-          ADMColorScalerFull *yuv2rgb;
-          ADMColorScalerFull *rgb2rgb;
-public:
-            ADM_flyDialogActionRgb(ADM_flyDialog *parent);
-            ~ADM_flyDialogActionRgb();
-        bool process(void);
-        void resetScaler(void);
-};
-//***************************************
-typedef float gfloat;
-/**
-    \class ADM_flyDialog
-    \brief Base class for flyDialog
-*/
-class ADM_COREVIDEOFILTER6_EXPORT ADM_flyDialog
-{
-    friend class ADM_flyDialogAction;
-    friend class ADM_flyDialogActionYuv;
-    friend class ADM_flyDialogActionRgb;
-  protected:
-   virtual ADM_colorspace toRgbColor(void);
-          void          updateZoom(void);
-          ADM_flyDialogAction *action;
-          uint64_t      _currentPts;
-          uint32_t      _w, _h, _zoomW, _zoomH;
-          float         _zoom;
-          uint32_t      _zoomChangeCount;
-          ADM_coreVideoFilter *_in;
-      
-          ADMImage      *_yuvBuffer;
-          ADM_byteBuffer _rgbByteBufferDisplay;
-
-
-          
-          uint8_t       _isYuvProcessing;
-          ResizeMethod  _resizeMethod;
-  
-          void EndConstructor(void);
-          
-  public:
-          void               recomputeSize(void);
-          virtual bool       nextImage(void);
-          virtual bool       sameImage(void);
-  public:
-          void    *_cookie; // whatever
-          void    *_slider; // widget
-          void    *_canvas; // Drawing zone
-          
-  
-  
-  /* Filter dependant : you have to implement them*/
-  virtual uint8_t    processYuv(ADMImage* in, ADMImage *out) {ADM_assert(0);return 1;}
-  virtual uint8_t    processRgb(uint8_t *in, uint8_t *out) {ADM_assert(0);return 1;}
-  virtual uint8_t    download(void)=0;
-  virtual uint8_t    upload(void)=0;
-  virtual bool       setCurrentPts(uint64_t pts)=0;
-  /* /filter dependant */
-  
-  
-  virtual uint8_t  update(void) {return 1;};
-            uint8_t  cleanup(void);
-  
-
-#ifdef USE_JOG
-  static void jogDial (void * my_data, signed short offset);
-  static void jogRing (void * my_data, gfloat angle);
-#endif
-
-          ADM_flyDialog(uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
-                             void *canvas, void *slider, int yuv, 
-                             ResizeMethod resizeMethod);
-  virtual ~ADM_flyDialog(void);
-// UI dependant part : They are implemented in ADM_flyDialogGtk/Qt/...
-public:  
-  virtual bool     isRgbInverted(void)=0;
-  virtual uint8_t  display(uint8_t *rgbData)=0;
-  virtual float    calcZoomFactor(void)=0;
-  virtual uint32_t sliderGet(void)=0;             // Return the slider value between 0 and ADM_FLY_SLIDER_MAX
-  virtual uint8_t  sliderSet(uint32_t value) =0;  // Set slider value between 0 and ADM_FLY_SLIDE_MAX
-  virtual void     postInit(uint8_t reInit)=0;
-  virtual uint8_t  sliderChanged(void);
-};
-#if !defined(ADM_FLY_INTERNAL)
-
-#ifdef ADM_UI_TYPE_BUILD
-#if ADM_UI_TYPE_BUILD == ADM_UI_QT4
-  #include "DIA_flyDialogQt4.h"
-  #define FLY_DIALOG_TYPE ADM_flyDialogQt4
-#else 
-  #if ADM_UI_TYPE_BUILD == ADM_UI_GTK
-    #include "DIA_flyDialogGtk.h"
-    #define FLY_DIALOG_TYPE ADM_flyDialogGtk
-  #else 
-    #if ADM_UI_TYPE_BUILD == ADM_UI_CLI
-      #include "DIA_flyDialogCli.h"
-      #define FLY_DIALOG_TYPE ADM_flyDialogCli
-    #else
-        #if ADM_UI_TYPE_BUILD != ADM_UI_NONE
-#error unknown UI type
-        #endif
-    #endif //CLI
-  #endif //GTK
-#endif // QT
-#else
-  #define FLY_DIALOG_TYPE ADM_UI_TYPE_BUILD_IS_NOT_DEFINED
-#endif
- 
-#endif //  ADM_FLY_INTERNAL
-
-#endif
-

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoFilter/src/DIA_flyDialog.cpp Deleted

@@ -1,300 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2006 by mean
-    email                : fixounet@free.fr
-***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************///
-
-#include "ADM_default.h"
-#include "ADM_coreVideoFilter.h"
-#define ADM_FLY_INTERNAL
-#include "DIA_flyDialog.h"
-#include "ADM_assert.h"
-
-extern "C" {
-#include "libavcodec/avcodec.h"
-}
-/**
-    \fn    ADM_flyDialog
-    \brief Constructor
-*/
-ADM_flyDialog::ADM_flyDialog(uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
-                                void *canvas, void *slider,int yuv, ResizeMethod resizeMethod)
-{
-	ADM_assert(canvas);
-
-	if (slider)
-		ADM_assert(in);
-
-	_w = width;
-	_h = height;
-	_isYuvProcessing = yuv;
-	_in = in;
-	_slider = slider;
-	_canvas = canvas;
-	_cookie = NULL;
-	_resizeMethod = resizeMethod;
-        _zoomChangeCount = 0;        
-	_yuvBuffer=new ADMImageDefault(_w,_h);
-	_currentPts=0;	
-}
-/**
-    \fn updateZoom
-*/
-void ADM_flyDialog::updateZoom(void)
-{   
-        _rgbByteBufferDisplay.clean();
-        _rgbByteBufferDisplay.setSize(_zoomW * _zoomH * 4);
-        action->resetScaler();
-}
-
-/**
- *      \fn Endconstructor
- *      \brief We need to call some virtual functions in the constructor; 
-        it does not work, so we do the 2nd part of the constructor here
- */
-void ADM_flyDialog::EndConstructor(void)
- {
-	if(_isYuvProcessing)
-	{
-        action=new ADM_flyDialogActionYuv(this);
-	}
-	else
-	{
-		action=new ADM_flyDialogActionRgb(this);
-	}
-
-        if (_resizeMethod != RESIZE_NONE)
-        {
-                _zoom = calcZoomFactor();
-                if (_zoom == 1)
-                {
-                        _resizeMethod = RESIZE_NONE;
-                }
-        }
-        if(_resizeMethod==RESIZE_NONE)
-        {
-            _zoom=1;
-            _zoomW=_w;
-            _zoomH=_h;
-        }
-        else
-        {
-                _zoomW = uint32_t (_w * _zoom);
-                _zoomH = uint32_t (_h * _zoom);
-        }
-        updateZoom();
-        postInit (false);
-  }
-/**
-    \fn    recomputeSize
-    \brief recompute zoom factor
-*/
-
-void ADM_flyDialog::recomputeSize(void)
-{
-    float new_zoom = calcZoomFactor();
-
-    ResizeMethod new_resizeMethod;
-    uint32_t new_zoomW;
-    uint32_t new_zoomH;
-
-    if (new_zoom == 1)
-    {
-        new_resizeMethod = RESIZE_NONE;
-        new_zoomW = _w;
-        new_zoomH = _h;
-    }
-    else
-    {
-        new_resizeMethod = RESIZE_AUTO;
-        new_zoomW = uint32_t (_w * new_zoom);
-        new_zoomH = uint32_t (_h * new_zoom);
-    }
-
-    if (new_resizeMethod == _resizeMethod && new_zoom == _zoom
-        && new_zoomW == _zoomW && new_zoomH == _zoomH)
-        return;
-
-    if (++_zoomChangeCount > 3 || new_zoomH < 30 || new_zoomW < 30)
-    {
-        ADM_info ("Resisting zoom size change from %dx%d (zoom %.5f) to %dx%d (zoom %.5f)\n",
-                _zoomW, _zoomH, _zoom, new_zoomW, new_zoomH, new_zoom);
-        return;
-    }
-
-    ADM_info ("Fixing zoom size from %dx%d (zoom %.5f) to correct %dx%d (zoom %.5f)\n",
-            _zoomW, _zoomH, _zoom, new_zoomW, new_zoomH, new_zoom);
-
-    _resizeMethod = new_resizeMethod;
-    _zoom = new_zoom;
-    _zoomW = new_zoomW;
-    _zoomH = new_zoomH;
-    updateZoom();
-    postInit (true);
-    sliderChanged();
-}
-
-/**
-    \fn cleanup
-    \brief deallocate
-*/
-uint8_t ADM_flyDialog::cleanup(void)
-{
-#define DEL1(x)    if(x) {delete [] x;x=NULL;}
-#define DEL2(x)    if(x) {delete  x;x=NULL;}
-	DEL2(_yuvBuffer);
-	_rgbByteBufferDisplay.clean();
-        DEL2(action);
-
-	return 1;
-}
-/**
-    \fn ~ADM_flyDialog
-    \brief destructor
-*/
-ADM_flyDialog::~ADM_flyDialog(void)
-{
-  cleanup(); 
-}
-
-/**
-      \fn sliderChanged
-      \brief callback to handle image changes
-*/
-uint8_t    ADM_flyDialog::sliderChanged(void)
-{
-  uint32_t fn= sliderGet();
-  uint32_t frameNumber;
-  uint32_t len,flags;
-  
-    ADM_assert(_yuvBuffer);
-    ADM_assert(_in);
-
-
-    double time;
-    time=fn;
-    time/=ADM_FLY_SLIDER_MAX;
-    time*=_in->getInfo()->totalDuration;
-    _in->goToTime(time);
-   
-
-   return nextImage();
-}
-/**
-    \fn toRgbColor
-*/
-ADM_colorspace ADM_flyDialog::toRgbColor(void)
-{
-    if(isRgbInverted()) return ADM_COLOR_BGR32A;
-    return ADM_COLOR_RGB32A;
-}
-/**
-    \fn sameImage
-*/
-bool ADM_flyDialog::sameImage(void)
-{
-    action->process();
-    return display(_rgbByteBufferDisplay.at(0));
-}
-/**
-    \fn nextImage
-*/
-bool ADM_flyDialog::nextImage(void)
-{
-    uint32_t frameNumber;
-    if(!_in->getNextFrame(&frameNumber,_yuvBuffer))
-    {
-      ADM_warning("[FlyDialog] Cannot get frame %u\n",frameNumber); 
-      return 0;
-    }
-    setCurrentPts(_yuvBuffer->Pts);
-    // Process...   
-    action->process();
-    return display(_rgbByteBufferDisplay.at(0));
-}
-//************************************
-// Implement the specific part
-// i.e. yuv processing or RGB processing
-//************************************
-ADM_flyDialogActionYuv::ADM_flyDialogActionYuv(ADM_flyDialog *p) : 
-                     ADM_flyDialogAction(p)
-{
-        _yuvBufferOut=new ADMImageDefault(parent->_w,parent->_h);
-        yuvToRgb=NULL;
-        
-}
-void ADM_flyDialogActionYuv::resetScaler(void)
-{
-    if(yuvToRgb) delete yuvToRgb;
-    yuvToRgb=new ADMColorScalerFull(ADM_CS_BICUBIC, 
-                            parent->_w,
-                            parent->_h,
-                            parent->_zoomW,
-                            parent->_zoomH,
-                            ADM_COLOR_YV12,parent->toRgbColor());
-}
-ADM_flyDialogActionYuv::~ADM_flyDialogActionYuv()
-{
-    if(_yuvBufferOut) delete _yuvBufferOut;
-    _yuvBufferOut=NULL;
-}
-bool ADM_flyDialogActionYuv::process(void)
-{
-        parent-> processYuv(parent->_yuvBuffer,_yuvBufferOut);
-        yuvToRgb->convertImage(_yuvBufferOut,parent->_rgbByteBufferDisplay.at(0));
-        return true;
-}
-//*****************************************
-ADM_flyDialogActionRgb::ADM_flyDialogActionRgb(ADM_flyDialog *p) :  ADM_flyDialogAction(p)
-{
-    uint32_t size=parent->_w*parent->_h*4;
-    _rgbByteBuffer.setSize(size);
-    _rgbByteBufferOut.setSize(size);
-     yuv2rgb =new ADMColorScalerSimple(parent->_w,parent->_h,ADM_COLOR_YV12,
-                parent->toRgbColor());
-    rgb2rgb=NULL;
-}
-void ADM_flyDialogActionRgb::resetScaler(void)
-{
-    if(rgb2rgb) delete rgb2rgb;
-    rgb2rgb=new ADMColorScalerFull(ADM_CS_BICUBIC, 
-                            parent->_w,
-                            parent->_h,
-                            parent->_zoomW,
-                            parent->_zoomH,
-                            ADM_COLOR_RGB32A,ADM_COLOR_RGB32A);
-}
-ADM_flyDialogActionRgb::~ADM_flyDialogActionRgb()
-{
-    _rgbByteBuffer.clean();
-    _rgbByteBufferOut.clean();
-    if(rgb2rgb) delete rgb2rgb;
-    if(yuv2rgb) delete yuv2rgb;
-    rgb2rgb=NULL;
-    yuv2rgb=NULL;
-    
-}
-bool ADM_flyDialogActionRgb::process(void)
-{
-    yuv2rgb->convertImage(parent->_yuvBuffer,_rgbByteBuffer.at(0));
-    if (parent->_resizeMethod != RESIZE_NONE)
-    {
-        parent->processRgb(_rgbByteBuffer.at(0),_rgbByteBufferOut.at(0));
-        rgb2rgb->convert(_rgbByteBufferOut.at(0), parent->_rgbByteBufferDisplay.at(0));
-    }else
-    {
-        parent->processRgb(_rgbByteBuffer.at(0),parent->_rgbByteBufferDisplay.at(0));
-    }
-    return true;
-}
-//******************************
-//EOF
-

avidemux_2.6.15.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-3.0.3.tar.bz2 Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_aac.h Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_ac3.h Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_dts.h Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_mp2.h Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters/CNR2/gtk Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters/CNR2/gtk/DIA_cnr2.cpp Deleted

@@ -1,352 +0,0 @@
-//
-// C++ Implementation: DIA_Msmooth
-//
-// Description: 
-//
-//
-// Author: mean <fixounet@free.fr>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-//
-
-#include "ADM_toolkitGtk.h"
-#include "ADM_vidCNR2_param.h"
-
-static GtkWidget        *create_dialog1 (void);
-
-#define CHECK_GET(x,y) {param->y=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(WID(x)));}
-#define CHECK_SET(x,y) {gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(WID(x)),param->y);}     
-
-#define ENTRY_SET(x) {gtk_write_entry(WID(entry##x),(int)param->x);}
-#define ENTRY_GET(x) {param->x=gtk_read_entry(WID(entry##x));}
-
-
-uint8_t DIA_cnr2(CNR2Param *param);
-uint8_t DIA_cnr2(CNR2Param *param)
-{
-GtkWidget *dialog;
-int ret=0;
-        dialog=create_dialog1();
-		gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
-									GTK_RESPONSE_OK,
-									GTK_RESPONSE_CANCEL,
-									-1);
-
-        // Update
-        ENTRY_SET(lm);ENTRY_SET(ln);
-        ENTRY_SET(um);ENTRY_SET(un);
-        ENTRY_SET(vm);ENTRY_SET(vn);
-
-        CHECK_SET(checkbuttonChroma,sceneChroma);
-
-        if(param->mode & 0xFF0000) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(WID(checkbuttonl)),1);
-        if(param->mode & 0xFF00) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(WID(checkbuttonu)),1);
-        if(param->mode & 0xFF) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(WID(checkbuttonv)),1);
-        
-        gtk_range_set_value (GTK_RANGE(WID(hscale1)),(gdouble)param->scdthr);
-        
-        //**************************
-        gtk_register_dialog(dialog);
-        if(gtk_dialog_run(GTK_DIALOG(dialog))==GTK_RESPONSE_OK)
-        {
-          GtkAdjustment *adj;   
-
-                adj=gtk_range_get_adjustment (GTK_RANGE(WID(hscale1)));
-                param->scdthr=(double)GTK_ADJUSTMENT(adj)->value;
-        
-                ENTRY_GET(lm);ENTRY_GET(ln);
-                ENTRY_GET(um);ENTRY_GET(un);
-                ENTRY_GET(vm);ENTRY_GET(vn);
-
-                CHECK_GET(checkbuttonChroma,sceneChroma);
-                param->mode=0;
-#define UPD(x,y) if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(WID(x)))) param->mode|=y;
-                        UPD(checkbuttonl,0xFF0000);
-                        UPD(checkbuttonu,0xFF00);
-                        UPD(checkbuttonv,0xFF);
-               
-
-                ret=1;
-        
-        }
-        gtk_unregister_dialog(dialog);
-        gtk_widget_destroy(dialog);
-        return ret;
-
-}
-
-//__________________________________
-
-GtkWidget*
-create_dialog1 (void)
-{
-  GtkWidget *dialog1;
-  GtkWidget *dialog_vbox1;
-  GtkWidget *vbox1;
-  GtkWidget *frame3;
-  GtkWidget *alignment3;
-  GtkWidget *hscale1;
-  GtkWidget *label9;
-  GtkWidget *frame1;
-  GtkWidget *alignment1;
-  GtkWidget *table1;
-  GtkWidget *label3;
-  GtkWidget *label4;
-  GtkWidget *label2;
-  GtkWidget *label5;
-  GtkWidget *label6;
-  GtkWidget *label7;
-  GtkWidget *entryln;
-  GtkWidget *entrylm;
-  GtkWidget *entryun;
-  GtkWidget *entryvn;
-  GtkWidget *entryum;
-  GtkWidget *entryvm;
-  GtkWidget *label10;
-  GtkWidget *checkbuttonl;
-  GtkWidget *checkbuttonu;
-  GtkWidget *checkbuttonv;
-  GtkWidget *label1;
-  GtkWidget *frame2;
-  GtkWidget *alignment2;
-  GtkWidget *vbox2;
-  GtkWidget *checkbuttonChroma;
-  GtkWidget *label8;
-  GtkWidget *dialog_action_area1;
-  GtkWidget *cancelbutton1;
-  GtkWidget *okbutton1;
-
-  dialog1 = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog1), QT_TR_NOOP("Chroma Noise Reduction 2"));
-  gtk_window_set_type_hint (GTK_WINDOW (dialog1), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
-  gtk_widget_show (dialog_vbox1);
-
-  vbox1 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox1);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
-
-  frame3 = gtk_frame_new (NULL);
-  gtk_widget_show (frame3);
-  gtk_box_pack_start (GTK_BOX (vbox1), frame3, TRUE, TRUE, 0);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame3), GTK_SHADOW_NONE);
-
-  alignment3 = gtk_alignment_new (0.5, 0.5, 1, 1);
-  gtk_widget_show (alignment3);
-  gtk_container_add (GTK_CONTAINER (frame3), alignment3);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment3), 0, 0, 12, 0);
-
-  hscale1 = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 1, 0)));
-  gtk_widget_show (hscale1);
-  gtk_container_add (GTK_CONTAINER (alignment3), hscale1);
-  gtk_scale_set_digits (GTK_SCALE (hscale1), 2);
-
-  label9 = gtk_label_new (QT_TR_NOOP("<b>Scene change Treshold</b>"));
-  gtk_widget_show (label9);
-  gtk_frame_set_label_widget (GTK_FRAME (frame3), label9);
-  gtk_label_set_use_markup (GTK_LABEL (label9), TRUE);
-
-  frame1 = gtk_frame_new (NULL);
-  gtk_widget_show (frame1);
-  gtk_box_pack_start (GTK_BOX (vbox1), frame1, TRUE, TRUE, 0);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_NONE);
-
-  alignment1 = gtk_alignment_new (0.5, 0.5, 1, 1);
-  gtk_widget_show (alignment1);
-  gtk_container_add (GTK_CONTAINER (frame1), alignment1);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment1), 0, 0, 12, 0);
-
-  table1 = gtk_table_new (4, 4, FALSE);
-  gtk_widget_show (table1);
-  gtk_container_add (GTK_CONTAINER (alignment1), table1);
-
-  label3 = gtk_label_new (QT_TR_NOOP("Sensibility"));
-  gtk_widget_show (label3);
-  gtk_table_attach (GTK_TABLE (table1), label3, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label3), GTK_JUSTIFY_CENTER);
-  gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5);
-
-  label4 = gtk_label_new (QT_TR_NOOP("Max"));
-  gtk_widget_show (label4);
-  gtk_table_attach (GTK_TABLE (table1), label4, 2, 3, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label4), GTK_JUSTIFY_CENTER);
-  gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
-
-  label2 = gtk_label_new ("");
-  gtk_widget_show (label2);
-  gtk_table_attach (GTK_TABLE (table1), label2, 0, 1, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
-
-  label5 = gtk_label_new (QT_TR_NOOP("Luma :"));
-  gtk_widget_show (label5);
-  gtk_table_attach (GTK_TABLE (table1), label5, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label5), 0, 0.5);
-
-  label6 = gtk_label_new (QT_TR_NOOP("Chroma U :"));
-  gtk_widget_show (label6);
-  gtk_table_attach (GTK_TABLE (table1), label6, 0, 1, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label6), 0, 0.5);
-
-  label7 = gtk_label_new (QT_TR_NOOP("Chroma V :"));
-  gtk_widget_show (label7);
-  gtk_table_attach (GTK_TABLE (table1), label7, 0, 1, 3, 4,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label7), 0, 0.5);
-
-  entryln = gtk_entry_new ();
-  gtk_widget_show (entryln);
-  gtk_table_attach (GTK_TABLE (table1), entryln, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  entrylm = gtk_entry_new ();
-  gtk_widget_show (entrylm);
-  gtk_table_attach (GTK_TABLE (table1), entrylm, 2, 3, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  entryun = gtk_entry_new ();
-  gtk_widget_show (entryun);
-  gtk_table_attach (GTK_TABLE (table1), entryun, 1, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  entryvn = gtk_entry_new ();
-  gtk_widget_show (entryvn);
-  gtk_table_attach (GTK_TABLE (table1), entryvn, 1, 2, 3, 4,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  entryum = gtk_entry_new ();
-  gtk_widget_show (entryum);
-  gtk_table_attach (GTK_TABLE (table1), entryum, 2, 3, 2, 3,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  entryvm = gtk_entry_new ();
-  gtk_widget_show (entryvm);
-  gtk_table_attach (GTK_TABLE (table1), entryvm, 2, 3, 3, 4,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  label10 = gtk_label_new (QT_TR_NOOP("Narrow"));
-  gtk_widget_show (label10);
-  gtk_table_attach (GTK_TABLE (table1), label10, 3, 4, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label10), 0, 0.5);
-
-  checkbuttonl = gtk_check_button_new_with_mnemonic ("");
-  gtk_widget_show (checkbuttonl);
-  gtk_table_attach (GTK_TABLE (table1), checkbuttonl, 3, 4, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  checkbuttonu = gtk_check_button_new_with_mnemonic ("");
-  gtk_widget_show (checkbuttonu);
-  gtk_table_attach (GTK_TABLE (table1), checkbuttonu, 3, 4, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  checkbuttonv = gtk_check_button_new_with_mnemonic ("");
-  gtk_widget_show (checkbuttonv);
-  gtk_table_attach (GTK_TABLE (table1), checkbuttonv, 3, 4, 3, 4,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  label1 = gtk_label_new (QT_TR_NOOP("<b>Settings</b>"));
-  gtk_widget_show (label1);
-  gtk_frame_set_label_widget (GTK_FRAME (frame1), label1);
-  gtk_label_set_use_markup (GTK_LABEL (label1), TRUE);
-
-  frame2 = gtk_frame_new (NULL);
-  gtk_widget_show (frame2);
-  gtk_box_pack_start (GTK_BOX (vbox1), frame2, TRUE, TRUE, 0);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_NONE);
-
-  alignment2 = gtk_alignment_new (0.5, 0.5, 1, 1);
-  gtk_widget_show (alignment2);
-  gtk_container_add (GTK_CONTAINER (frame2), alignment2);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment2), 0, 0, 12, 0);
-
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox2);
-  gtk_container_add (GTK_CONTAINER (alignment2), vbox2);
-
-  checkbuttonChroma = gtk_check_button_new_with_mnemonic (QT_TR_NOOP("Use also chroma to detect scene change"));
-  gtk_widget_show (checkbuttonChroma);
-  gtk_box_pack_start (GTK_BOX (vbox2), checkbuttonChroma, FALSE, FALSE, 0);
-
-  label8 = gtk_label_new (QT_TR_NOOP("<b>Mode</b>"));
-  gtk_widget_show (label8);
-  gtk_frame_set_label_widget (GTK_FRAME (frame2), label8);
-  gtk_label_set_use_markup (GTK_LABEL (label8), TRUE);
-
-  dialog_action_area1 = GTK_DIALOG (dialog1)->action_area;
-  gtk_widget_show (dialog_action_area1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-
-  cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), cancelbutton1, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT);
-
-  okbutton1 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), okbutton1, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog1, "dialog1");
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog_vbox1, "dialog_vbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, vbox1, "vbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, frame3, "frame3");
-  GLADE_HOOKUP_OBJECT (dialog1, alignment3, "alignment3");
-  GLADE_HOOKUP_OBJECT (dialog1, hscale1, "hscale1");
-  GLADE_HOOKUP_OBJECT (dialog1, label9, "label9");
-  GLADE_HOOKUP_OBJECT (dialog1, frame1, "frame1");
-  GLADE_HOOKUP_OBJECT (dialog1, alignment1, "alignment1");
-  GLADE_HOOKUP_OBJECT (dialog1, table1, "table1");
-  GLADE_HOOKUP_OBJECT (dialog1, label3, "label3");
-  GLADE_HOOKUP_OBJECT (dialog1, label4, "label4");
-  GLADE_HOOKUP_OBJECT (dialog1, label2, "label2");
-  GLADE_HOOKUP_OBJECT (dialog1, label5, "label5");
-  GLADE_HOOKUP_OBJECT (dialog1, label6, "label6");
-  GLADE_HOOKUP_OBJECT (dialog1, label7, "label7");
-  GLADE_HOOKUP_OBJECT (dialog1, entryln, "entryln");
-  GLADE_HOOKUP_OBJECT (dialog1, entrylm, "entrylm");
-  GLADE_HOOKUP_OBJECT (dialog1, entryun, "entryun");
-  GLADE_HOOKUP_OBJECT (dialog1, entryvn, "entryvn");
-  GLADE_HOOKUP_OBJECT (dialog1, entryum, "entryum");
-  GLADE_HOOKUP_OBJECT (dialog1, entryvm, "entryvm");
-  GLADE_HOOKUP_OBJECT (dialog1, label10, "label10");
-  GLADE_HOOKUP_OBJECT (dialog1, checkbuttonl, "checkbuttonl");
-  GLADE_HOOKUP_OBJECT (dialog1, checkbuttonu, "checkbuttonu");
-  GLADE_HOOKUP_OBJECT (dialog1, checkbuttonv, "checkbuttonv");
-  GLADE_HOOKUP_OBJECT (dialog1, label1, "label1");
-  GLADE_HOOKUP_OBJECT (dialog1, frame2, "frame2");
-  GLADE_HOOKUP_OBJECT (dialog1, alignment2, "alignment2");
-  GLADE_HOOKUP_OBJECT (dialog1, vbox2, "vbox2");
-  GLADE_HOOKUP_OBJECT (dialog1, checkbuttonChroma, "checkbuttonChroma");
-  GLADE_HOOKUP_OBJECT (dialog1, label8, "label8");
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog_action_area1, "dialog_action_area1");
-  GLADE_HOOKUP_OBJECT (dialog1, cancelbutton1, "cancelbutton1");
-  GLADE_HOOKUP_OBJECT (dialog1, okbutton1, "okbutton1");
-
-  return dialog1;
-}
-

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters/Equalizer/gtk Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters/Equalizer/gtk/DIA_equalizer.cpp Deleted

@@ -1,517 +0,0 @@
-
-//
-/***************************************************************************
-                          DIA_Equalizer
-                             -------------------
-
-			   Ui for equalizer, ugly
-
-    begin                : 30 Dec 2004
-    copyright            : (C) 2004/5 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <math.h>
-
-#include "ADM_toolkitGtk.h"
-
-#include "ADM_image.h"
-#include "ADM_videoFilter.h"
-#include "ADM_vidEqualizer.h"
-#include "ADM_colorspace.h"
-extern "C" {
-#include "libavcodec/avcodec.h"
-}
-
-static ColYuvRgb    *rgbConv=NULL;
-uint8_t DIA_getEqualizer(EqualizerParam *param, ADMImage *image);
-
-static GtkWidget	*create_dialog1 (void);
-static void  		update ( void);
-static gboolean 	draw (void );
-// static void 		reset( void );
-static void 		upload(void);
-static void  		read ( void );
-static void		recalc( void );
-static void 		drawCross(uint32_t x,uint32_t y);
-static void 		spinner(void);
-static void 		compute_histogram(void);
-static void 		frame_changed( void );
-
-extern void GUI_RGBDisplay(uint8_t * dis, uint32_t w, uint32_t h, void *widg);
-extern float UI_calcZoomToFitScreen(GtkWindow* window, GtkWidget* drawingArea, uint32_t imageWidth, uint32_t imageHeight);
-extern void UI_centreCanvasWindow(GtkWindow *window, GtkWidget *canvas, int newCanvasWidth, int newCanvasHeight);
-
-static ADMImage *imgsrc,*imgdst,*imgdisplay;
-static GtkWidget *dialog=NULL;
-static uint32_t scaler[256];
-static uint32_t w,h,zoomW,zoomH;
-static uint32_t *rgbbuffer=NULL;
-static ADMImageResizer *resizer=NULL;
-
-static uint32_t *histogram=NULL;
-static uint32_t *histogramout=NULL;
-static AVDMGenericVideoStream *incoming;
-static const int cross[8]= {0,36,73,109,
-			146,182,219,255};
-#define CROSS 0xFFFF0000
-#define DRAW  0x0000FF00
-#define LINER 0x0000FFFF
-
-#define ZOOM_FACTOR 5
-
-#define A_RESET 99
-//
-//	Video is in YV12 Colorspace
-//
-//
-uint8_t DIA_getEqualizer(EqualizerParam *param, AVDMGenericVideoStream *in)
-{
-	int ret;
-	uint32_t l,f;
-	uint32_t max=in->getInfo()->nb_frames;
-        
-	incoming=in;
-	// Allocate space for green-ised video
-	w=in->getInfo()->width;
-	h=in->getInfo()->height;
-	rgbConv=new ColYuvRgb(w,h);
-        rgbConv->reset(w,h);
-	
-	histogram=new uint32_t [256*128];
-        histogramout=new uint32_t [256*128];
-	
-	imgdst=new ADMImage(w,h);
-	imgsrc=new ADMImage(w,h);
-        imgdisplay=new ADMImage(w,h);
-	
-        max=max/2;
-        
-	ADM_assert(in->getFrameNumberNoAlloc(max, &l, imgsrc,&f));
-        memcpy(imgdisplay->data+w*h,imgsrc->data+w*h,(w*h)>>1);
-	// init local equalizer
-		
-        memcpy(scaler,param->_scaler,sizeof(scaler));
-
-	dialog=create_dialog1();
-	gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
-										A_RESET,
-										GTK_RESPONSE_OK,
-										GTK_RESPONSE_CANCEL,
-										GTK_RESPONSE_APPLY,
-										-1);
-	gtk_register_dialog(dialog);
-	gtk_widget_set_usize(WID(drawingarea_histin), 256,128);
-    gtk_widget_set_usize(WID(drawingarea_histout), 256,128);
-
-	float zoom = UI_calcZoomToFitScreen(GTK_WINDOW(dialog), WID(drawingarea1), w, h);
-
-	zoomW = w * zoom;
-	zoomH = h * zoom;
-	rgbbuffer=new uint32_t[zoomW*zoomH];
-
-	gtk_widget_set_usize(WID(drawingarea1), zoomW, zoomH);
-
-	if (zoom < 1)
-	{
-		UI_centreCanvasWindow((GtkWindow*)dialog, WID(drawingarea1), zoomW, zoomH);
-		resizer = new ADMImageResizer(w, h, zoomW, zoomH, PIX_FMT_YUV420P, PIX_FMT_RGB32);
-	}
-
-	  upload();
-
-	gtk_signal_connect(GTK_OBJECT(WID(drawingarea1)), "expose_event",
-		       GTK_SIGNAL_FUNC(draw),
-		       NULL);
-		       
-	
-	gtk_signal_connect(GTK_OBJECT(WID(gui_scale)), "value_changed",GTK_SIGNAL_FUNC(frame_changed),   NULL);
-  //      gtk_signal_connect(GTK_OBJECT(WID(curve1)), "curve-type-changed",GTK_SIGNAL_FUNC(spinner),   NULL);
-	
-        /*
-
-        */
-        GtkWidget *curve=WID(curve1);
-        gtk_curve_set_range (GTK_CURVE(curve),0,255.,0.,255.);
-	
-        gtk_widget_show(dialog);
-        upload();
-        compute_histogram();
-        spinner();
-	ret=0;
-	int response;
-_again:
-	while( (response=gtk_dialog_run(GTK_DIALOG(dialog)))==GTK_RESPONSE_APPLY)
-	{
-		spinner();	
-	}
-        if(response==A_RESET)
-        {
-                gfloat duo[2]={0,255.};
-                gtk_curve_set_curve_type(GTK_CURVE(WID(curve1)),GTK_CURVE_TYPE_SPLINE);
-                gtk_curve_reset(GTK_CURVE(WID(curve1)));
-
-                goto _again;
-        }
-        
-	if(response==GTK_RESPONSE_OK)
-        {
-		printf("Accepting new values\n");
-		memcpy(param->_scaler,scaler,sizeof(scaler));
-		ret=1;
-	}
-	gtk_unregister_dialog(dialog);
-	gtk_widget_destroy(dialog);
-	
-	delete imgdst;
-	delete imgsrc;
-        delete imgdisplay;
-	delete [] rgbbuffer;
-	
-	delete [] histogram;
-        delete [] histogramout;
-    delete rgbConv;
-
-	if (resizer)
-	{
-		delete resizer;
-		resizer=NULL;
-	}
-
-    rgbConv=NULL;    
-	histogram=NULL;
-        histogramout=NULL;
-	
-	rgbbuffer=NULL;
-	imgdst=NULL;
-	imgsrc=NULL;
-	dialog=NULL;
-        imgdisplay=NULL;
-	return ret;
-
-}
-void frame_changed( void )
-{
-uint32_t new_frame,max,l,f;
-double   percent;
-GtkWidget *wid;	
-GtkAdjustment *adj;
-	
-	max=incoming->getInfo()->nb_frames;
-	wid=WID(gui_scale);
-	adj=gtk_range_get_adjustment (GTK_RANGE(wid));
-	new_frame=0;
-	
-	percent=(double)GTK_ADJUSTMENT(adj)->value;
-	percent*=max;
-	percent/=100.;
-	new_frame=(uint32_t)floor(percent);
-	
-	if(new_frame>=max) new_frame=max-1;
-	
-	ADM_assert(incoming->getFrameNumberNoAlloc(new_frame, &l, imgsrc,&f));
-         memcpy(imgdisplay->data+w*h,imgsrc->data+w*h,(w*h)>>1);
-	compute_histogram();
-	update();
-
-}
-void spinner(void)
-{
-		read();
-		recalc();
-		upload();
-                compute_histogram();
-		update();
-}
-void recalc( void )
-{
-uint32_t y,tgt;
-	// compute the in-between field & display them
-	
-	draw();
-}
-void drawCross(uint32_t x,uint32_t y)
-{
-
-}
-void update( void)
-{
-	uint8_t *src,*dst,*disp;
-	src=imgsrc->data;
-	dst=imgdst->data;
-	// Only do left side of target
-	for(int y=0;y<h;y++)
-	{
-		for(int x=0;x<w;x++)
-		{
-			*dst=scaler[*src];
-			dst++;
-			src++;
-		}		
-	}
-        // Img src = 10
-        //           01
-        // Img dst= 01
-        //          10
-        uint32_t half=w>>1;
-        
-        dst=imgdst->data;
-        src=imgsrc->data;
-        disp=imgdisplay->data;
-        
-        for(int y=0;y<h;y++)
-        {
-                if(y>h/2)
-                {
-                        memcpy(disp,src,half);
-                        memcpy(disp+half,dst+half,half);
-                
-                
-                }
-                else
-                {
-                
-                        memcpy(disp,dst,half);
-                        memcpy(disp+half,src+half,half);
-                }
-                src+=w;
-                dst+=w;
-                disp+=w;
-        
-        }
-	// udate u & v
-	// now convert to rgb
-	//COL_yv12rgb(  w,   h,imgdisplay->data,(uint8_t *)rgbbuffer );
-	if (resizer)
-		resizer->resize(imgdisplay->data, (uint8_t*)rgbbuffer);
-	else
-		rgbConv->scale(imgdisplay->data, (uint8_t*)rgbbuffer);
-
-	draw();
-}
-// Compute histogram
-// Top is histogram in, bottom is histogram out
-void compute_histogram(void)
-{
-	uint32_t value[256];
-        uint32_t valueout[256];
-        uint8_t v;
-        
-	memset(value,0,256*sizeof(uint32_t));
-        memset(valueout,0,256*sizeof(uint32_t));
-        // In
-	for(uint32_t t=0;t<w*h;t++)
-	{
-                v=imgsrc->data[t];
-		value[v]++;	
-                valueout[scaler[v]]++;
-	}
-	// normalize
-	double d,a;
-	a=w*h;
-	for(uint32_t i=0;i<256;i++)
-	{
-		d=value[i];
-		d*=256*ZOOM_FACTOR;
-		d/=a;
-		value[i]=(uint32_t)floor(d+0.49);
-		
-		if(value[i]>127) value[i]=127;
-                
-                d=valueout[i];
-                d*=256*ZOOM_FACTOR;
-                d/=a;
-                valueout[i]=(uint32_t)floor(d+0.49);
-                
-                if(valueout[i]>127) valueout[i]=127;
-                
-                
-	}
-	// Draw
-	memset(histogram,0,256*128*sizeof(uint32_t));
-        memset(histogramout,0,256*128*sizeof(uint32_t));
-	uint32_t y,tgt,yout;
-	for(uint32_t i=0;i<256;i++)
-	{
-		y=value[i];
-                
-		for(uint32_t u=0;u<=y;u++)
-		{
-			tgt=i+(127-u)*256;
-			histogram[tgt]=0xFFFFFFFF;
-		}
-                
-                y=valueout[i];
-                
-                for(uint32_t u=0;u<=y;u++)
-                {
-                        tgt=i+(127-u)*256;
-                        histogramout[tgt]=0xFFFFFFFF;
-                }
-	}
-
-        
-}
-/*---------------------------------------------------------------------------
-	Actually draw the working frame on screen
-*/
-gboolean draw (void)
-{
-	GtkWidget *draw=WID(drawingarea1);
-
-	GUI_RGBDisplay((uint8_t *)rgbbuffer, zoomW, zoomH, (void *)draw);
-/*	
-	draw=WID(histogram);
-	GUI_RGBDisplay((uint8_t *)bargraph, 256,256, (void *)draw);
-*/	
-	draw=WID(drawingarea_histin);
-	GUI_RGBDisplay((uint8_t *)histogram, 256,128, (void *)draw);
-	
-        draw=WID(drawingarea_histout);
-        GUI_RGBDisplay((uint8_t *)histogramout, 256,128, (void *)draw);
-        
-	return true;
-}
-
-void read ( void)
-{
-uint32_t g;
-
-        gfloat sample[256];
-        gtk_curve_get_vector(GTK_CURVE(WID(curve1)),256,sample);
-        for(int i=0;i<256;i++)
-                {
-                        if(sample[i]<0) g=0;
-                        else if(sample[i]>255) g=255;
-                                else g=(uint32_t)sample[i];
-                        scaler[i]=g;
-                      //  printf("%u %u\n",i,scaler[i]);
-                }
-}
-
-void upload(void)
-{
-#define SCALING 1
-gfloat g;
-
-        gfloat sample[256];
-        
-        for(int i=0;i<256/SCALING;i++)
-                {
-                       
-                       sample[i]=scaler[i*SCALING];
-                }
-        gtk_curve_set_vector(GTK_CURVE(WID(curve1)),256/SCALING,sample);
-        //gtk_curve_set_curve_type(GTK_CURVE(WID(curve1)),GTK_CURVE_TYPE_LINEAR);
-
-}
-GtkWidget*
-create_dialog1 (void)
-{
-  GtkWidget *dialog1;
-  GtkWidget *dialog_vbox1;
-  GtkWidget *vbox1;
-  GtkWidget *drawingarea1;
-  GtkWidget *gui_scale;
-  GtkWidget *hbox1;
-  GtkWidget *curve1;
-  GtkWidget *vbox2;
-  GtkWidget *drawingarea_histin;
-  GtkWidget *drawingarea_histout;
-  GtkWidget *dialog_action_area1;
-  GtkWidget *button1;
-  GtkWidget *button2;
-  GtkWidget *button3;
-  GtkWidget *button4;
-
-  dialog1 = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog1), QT_TR_NOOP("Equalizer"));
-  gtk_window_set_type_hint (GTK_WINDOW (dialog1), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
-  gtk_widget_show (dialog_vbox1);
-
-  vbox1 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox1);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
-
-  drawingarea1 = gtk_drawing_area_new ();
-  gtk_widget_show (drawingarea1);
-  gtk_box_pack_start (GTK_BOX (vbox1), drawingarea1, TRUE, TRUE, 0);
-
-  gui_scale = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 10, 10)));
-  gtk_widget_show (gui_scale);
-  gtk_box_pack_start (GTK_BOX (vbox1), gui_scale, TRUE, TRUE, 0);
-
-  hbox1 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox1);
-  gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0);
-
-  curve1 = gtk_curve_new ();
-  gtk_widget_show (curve1);
-  gtk_box_pack_start (GTK_BOX (hbox1), curve1, TRUE, TRUE, 0);
-  gtk_curve_set_range (GTK_CURVE (curve1), 0, 1, 0, 1);
-
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox2);
-  gtk_box_pack_start (GTK_BOX (hbox1), vbox2, TRUE, TRUE, 0);
-
-  drawingarea_histin = gtk_drawing_area_new ();
-  gtk_widget_show (drawingarea_histin);
-  gtk_box_pack_start (GTK_BOX (vbox2), drawingarea_histin, TRUE, TRUE, 0);
-
-  drawingarea_histout = gtk_drawing_area_new ();
-  gtk_widget_show (drawingarea_histout);
-  gtk_box_pack_start (GTK_BOX (vbox2), drawingarea_histout, TRUE, TRUE, 0);
-
-  dialog_action_area1 = GTK_DIALOG (dialog1)->action_area;
-  gtk_widget_show (dialog_action_area1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-
-  button1 = gtk_button_new_from_stock ("gtk-clear");
-  gtk_widget_show (button1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), button1, A_RESET);
-  GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT);
-
-  button2 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (button2);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), button2, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (button2, GTK_CAN_DEFAULT);
-
-  button3 = gtk_button_new_from_stock ("gtk-apply");
-  gtk_widget_show (button3);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), button3, GTK_RESPONSE_APPLY);
-  GTK_WIDGET_SET_FLAGS (button3, GTK_CAN_DEFAULT);
-
-  button4 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (button4);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), button4, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (button4, GTK_CAN_DEFAULT);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog1, "dialog1");
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog_vbox1, "dialog_vbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, vbox1, "vbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, drawingarea1, "drawingarea1");
-  GLADE_HOOKUP_OBJECT (dialog1, gui_scale, "gui_scale");
-  GLADE_HOOKUP_OBJECT (dialog1, hbox1, "hbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, curve1, "curve1");
-  GLADE_HOOKUP_OBJECT (dialog1, vbox2, "vbox2");
-  GLADE_HOOKUP_OBJECT (dialog1, drawingarea_histin, "drawingarea_histin");
-  GLADE_HOOKUP_OBJECT (dialog1, drawingarea_histout, "drawingarea_histout");
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog_action_area1, "dialog_action_area1");
-  GLADE_HOOKUP_OBJECT (dialog1, button1, "button1");
-  GLADE_HOOKUP_OBJECT (dialog1, button2, "button2");
-  GLADE_HOOKUP_OBJECT (dialog1, button3, "button3");
-  GLADE_HOOKUP_OBJECT (dialog1, button4, "button4");
-
-  return dialog1;
-}

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters/Srt/gtk Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters/Srt/gtk/DIA_srt.cpp Deleted

@@ -1,269 +0,0 @@
-/***************************************************************************
-                          ADM_guiSRT.cpp  -  description
-                             -------------------
-    begin                : Wed Dec 18 2002
-    copyright            : (C) 2002 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "ADM_toolkitGtk.h"
-#include "DIA_flyDialog.h"
-
-
-#include "DIA_fileSel.h"
-
-#include "ADM_videoFilter.h"
-
-class ADMfont;
-#include "ADM_vidSRT.h"
-#include "DIA_flySrtPos.h"
-#include "ADM_colorspace.h"
-
-
-
-static void read( void );
-static void upload ( void );
-static gboolean slider_update( void );
-static gboolean gui_update( void);
-static gboolean gui_draw( void );
-static GtkWidget *create_dialog1 (void);
-
-static GtkWidget *dialog=NULL;
-static flySrtPos *myCrop=NULL;
-static int lock=0;
-
-/**
-      \fn DIA_srtPos
-      \brief Dialog that handles subtitle size and position
-*/
-int DIA_srtPos(AVDMGenericVideoStream *in,uint32_t *size,uint32_t *position)
-{
-  uint8_t ret=0;
-  
-        uint32_t width,height;
-
-        // Allocate space for green-ised video
-        width=in->getInfo()->width;
-        height=in->getInfo()->height;
-
-        dialog=create_dialog1();
-
-		gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
-									GTK_RESPONSE_OK,
-									GTK_RESPONSE_CANCEL,
-									-1);
-
-        gtk_register_dialog(dialog);
-        gtk_window_set_title (GTK_WINDOW (dialog), QT_TR_NOOP("Subtitle Size and Position"));
-        gtk_widget_show(dialog);
-	
-        myCrop=new flySrtPos( width, height,in,WID(drawingarea1),WID(hscale1));
-        myCrop->param.fontSize=*size;
-        myCrop->param.position=*position;
-
-        gtk_range_set_range(GTK_RANGE(WID(vscale1)),0,height-1);
-
-        myCrop->upload();
-        myCrop->sliderChanged();
-        
-        gtk_signal_connect(GTK_OBJECT(WID(drawingarea1)), "expose_event",
-            GTK_SIGNAL_FUNC(gui_draw),
-            NULL);
-        
-        gtk_signal_connect (GTK_OBJECT(WID( spinbutton1)), "value_changed",
-                    GTK_SIGNAL_FUNC (gui_update),
-                    NULL);
-        
-         gtk_signal_connect (GTK_OBJECT(WID( hscale1)), "value_changed",
-                    GTK_SIGNAL_FUNC (slider_update),
-                    NULL);
-
-          gtk_signal_connect (GTK_OBJECT(WID( vscale1)), "value_changed",
-                    GTK_SIGNAL_FUNC (gui_update),
-                    NULL);
-       
-        ret=0;
-        int response;
-        response=gtk_dialog_run(GTK_DIALOG(dialog));
-
-        if(response==GTK_RESPONSE_OK)
-        {
-            myCrop->download();
-            *size=myCrop->param.fontSize;
-            *position=myCrop->param.position;
-            ret=1;
-        }
-        gtk_unregister_dialog(dialog);
-        gtk_widget_destroy(dialog);
-        delete myCrop;
-        return ret;
-}
-/**********************************/
-void read( void )
-{
-	myCrop->download();
-}
-gboolean slider_update( void )
-{
-        myCrop->sliderChanged();
-        return true;
-}
-gboolean gui_update( void)
-{
-  if(lock) return true;
-      myCrop->update();
-  return true;
-}
-gboolean gui_draw( void )
-{
-	myCrop->display();
-	return true;
-}
-
-/******************************/
-#define SPIN_GET(x,y) {y= gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(lookup_widget(dialog,#x))) ;\
-				printf(#x":%d\n", y);}
-
-#define SPIN_SET(x,y)  {gtk_spin_button_set_value(GTK_SPIN_BUTTON(lookup_widget(dialog,#x)),(gfloat)y) ; printf(#x":%d\n", y);}
-
-
-uint8_t    flySrtPos::upload(void)
-{
-        SPIN_SET(spinbutton1,param.fontSize);
-        
-        int32_t max=_h;
-        max-=(SRT_MAX_LINE)*param.fontSize;
-        if(max<0) max=0;
-        if(param.position>=max)
-        {
-          param.position=max;
-        }
-        
-        GtkAdjustment *adj=gtk_range_get_adjustment (GTK_RANGE(WID(vscale1)));
-        GTK_ADJUSTMENT(adj)->value=param.position;
-        return 1;
-}
-uint8_t    flySrtPos::download(void)
-{
-        SPIN_GET(spinbutton1,param.fontSize);
-        GtkAdjustment *adj=gtk_range_get_adjustment (GTK_RANGE(WID(vscale1)));
-        param.position=(uint32_t)GTK_ADJUSTMENT(adj)->value;
-        
-        int32_t max=_h;
-        max-=(SRT_MAX_LINE)*param.fontSize;
-        if(max<0) max=0;
-        if(param.position>=max)
-        {
-          param.position=max;
-          upload(); 
-        }
-        
-        return 1;
-}
-
-/*
-	Almost straigh out of glade2
-
-*/
-
-GtkWidget*
-create_dialog1 (void)
-{
-  GtkWidget *dialog1;
-  GtkWidget *dialog_vbox1;
-  GtkWidget *vbox1;
-  GtkWidget *hbox1;
-  GtkWidget *label1;
-  GtkObject *spinbutton1_adj;
-  GtkWidget *spinbutton1;
-  GtkWidget *hscale1;
-  GtkWidget *hbox2;
-  GtkWidget *drawingarea1;
-  GtkWidget *vscale1;
-  GtkWidget *dialog_action_area1;
-  GtkWidget *cancelbutton1;
-  GtkWidget *okbutton1;
-
-  dialog1 = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog1), QT_TR_NOOP("Subtitle Size and Position"));
-  gtk_window_set_type_hint (GTK_WINDOW (dialog1), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
-  gtk_widget_show (dialog_vbox1);
-
-  vbox1 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox1);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
-
-  hbox1 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox1);
-  gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
-
-  label1 = gtk_label_new (QT_TR_NOOP("Font Size:"));
-  gtk_widget_show (label1);
-  gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 0);
-
-  spinbutton1_adj = gtk_adjustment_new (1, 6, 99, 1, 10, 10);
-  spinbutton1 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton1_adj), 1, 2);
-  gtk_widget_show (spinbutton1);
-  gtk_box_pack_start (GTK_BOX (hbox1), spinbutton1, FALSE, FALSE, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton1), TRUE);
-
-  hscale1 = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 99, 1, 1, 1)));
-  gtk_widget_show (hscale1);
-  gtk_box_pack_start (GTK_BOX (vbox1), hscale1, FALSE, FALSE, 0);
-
-  hbox2 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox2);
-  gtk_box_pack_start (GTK_BOX (vbox1), hbox2, TRUE, TRUE, 0);
-
-  drawingarea1 = gtk_drawing_area_new ();
-  gtk_widget_show (drawingarea1);
-  gtk_box_pack_start (GTK_BOX (hbox2), drawingarea1, TRUE, TRUE, 0);
-
-  vscale1 = gtk_vscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 100, 1, 1, 1, 1)));
-  gtk_widget_show (vscale1);
-  gtk_box_pack_start (GTK_BOX (hbox2), vscale1, FALSE, FALSE, 0);
-  gtk_scale_set_digits (GTK_SCALE (vscale1), 0);
-
-  dialog_action_area1 = GTK_DIALOG (dialog1)->action_area;
-  gtk_widget_show (dialog_action_area1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-
-  cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), cancelbutton1, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT);
-
-  okbutton1 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), okbutton1, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog1, "dialog1");
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog_vbox1, "dialog_vbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, vbox1, "vbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, hbox1, "hbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, label1, "label1");
-  GLADE_HOOKUP_OBJECT (dialog1, spinbutton1, "spinbutton1");
-  GLADE_HOOKUP_OBJECT (dialog1, hscale1, "hscale1");
-  GLADE_HOOKUP_OBJECT (dialog1, hbox2, "hbox2");
-  GLADE_HOOKUP_OBJECT (dialog1, drawingarea1, "drawingarea1");
-  GLADE_HOOKUP_OBJECT (dialog1, vscale1, "vscale1");
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog_action_area1, "dialog_action_area1");
-  GLADE_HOOKUP_OBJECT (dialog1, cancelbutton1, "cancelbutton1");
-  GLADE_HOOKUP_OBJECT (dialog1, okbutton1, "okbutton1");
-
-  return dialog1;
-}
-
-//-------------------------------

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/gtk Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/gtk/DIA_asharp.cpp Deleted

@@ -1,297 +0,0 @@
-/**/
-/***************************************************************************
-                          DIA_hue
-                             -------------------
-
-                           Ui for hue & sat
-
-    begin                : 08 Apr 2005
-    copyright            : (C) 2004/5 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "ADM_toolkitGtk.h"
-#include "ADM_image.h"
-#include "ADM_coreVideoFilterInternal.h"
-#include "DIA_flyDialog.h"
-#include "DIA_flyAsharp.h"
-
-
-uint8_t DIA_getASharp(asharp *param, ADM_coreVideoFilter *in);
-
-static GtkWidget        *create_dialog1 (void);
-static gboolean         draw (void );
-static void             upload(void);
-static void             download(void);
-static void             frame_changed( void );
-static void             hue_changed( void);
-
-static int lock=0;
-static GtkWidget *dialog=NULL;
-static flyASharp *myCrop=NULL;
-
-//
-//      Video is in YV12 Colorspace
-//
-//
-#if 0
-uint8_t DIA_getASharp(asharp *param, ADM_coreVideoFilter *in)
-{
-      uint32_t width,height;
-      uint8_t ret=0;
-        // Allocate space for green-ised video
-        width=in->getInfo()->width;
-        height=in->getInfo()->height;
-
-        dialog=create_dialog1();
-		gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
-									GTK_RESPONSE_OK,
-									GTK_RESPONSE_CANCEL,
-									-1);
-        gtk_register_dialog(dialog);
-        gtk_window_set_title (GTK_WINDOW (dialog), QT_TR_NOOP("ASHARP"));
-        gtk_widget_show(dialog);
-
-        gtk_signal_connect(GTK_OBJECT(WID(drawingarea1)), "expose_event",
-            GTK_SIGNAL_FUNC(draw),
-            NULL);
-//
-        gtk_signal_connect(GTK_OBJECT(WID(hscale1)), "value_changed",GTK_SIGNAL_FUNC(frame_changed),   NULL);
-        gtk_signal_connect(GTK_OBJECT(WID(spinbuttonT)), "value_changed",GTK_SIGNAL_FUNC(hue_changed),   NULL);
-        gtk_signal_connect(GTK_OBJECT(WID(spinbuttonD)), "value_changed",GTK_SIGNAL_FUNC(hue_changed),   NULL);
-        gtk_signal_connect(GTK_OBJECT(WID(spinbuttonB)), "value_changed",GTK_SIGNAL_FUNC(hue_changed),   NULL);
-        gtk_widget_show(dialog);
-
-          
-        myCrop=new flyASharp( width, height,in,WID(drawingarea1),WID(hscale1));
-        memcpy(&(myCrop->param),param,sizeof(ASHARP_PARAM));
-        myCrop->upload();
-        myCrop->sliderChanged();
-        ret=0;
-        int response;
-        response=gtk_dialog_run(GTK_DIALOG(dialog));
-
-        if(response==GTK_RESPONSE_OK)
-        {
-            myCrop->download();
-            memcpy(param,&(myCrop->param),sizeof(ASHARP_PARAM));
-            ret=1;
-        }
-        gtk_unregister_dialog(dialog);
-        gtk_widget_destroy(dialog);
-        delete myCrop;
-        return ret;
-}
-void hue_changed( void)
-{
-  if(lock) return;
-  
-   myCrop->update();
-  
-}
-void frame_changed( void )
-{
-  myCrop->sliderChanged();
-}
-gboolean draw (void)
-{
-    myCrop->display();
-}
-//
-#define SPIN_GET(x,y) {param.x= gtk_spin_button_get_value(GTK_SPIN_BUTTON(WID(y))) ;}
-#define SPIN_SET(x,y)  {gtk_spin_button_set_value(GTK_SPIN_BUTTON(WID(y)),(gfloat)param.x) ;}
-
-#define CHECK_GET(x,y) {param.x=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(WID(y)));}
-#define CHECK_SET(x,y) {gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(WID(y)),param.x);}
-
-void upload( void)
-{
-    myCrop->upload();
-}
-void download (void)
-{
-     myCrop->download();
-}
-/**************************************/
-uint8_t flyASharp::upload(void)
-{
-    lock++;
-        SPIN_SET(t,spinbuttonT);
-        SPIN_SET(d,spinbuttonD);
-        SPIN_SET(b,spinbuttonB);
-
-        CHECK_SET(bf,checkbuttonBF);
-    lock--;
-        return 1;
-}
-uint8_t flyASharp::download (void)
-{
-    
-        SPIN_GET(t,spinbuttonT);
-        SPIN_GET(d,spinbuttonD);
-        SPIN_GET(b,spinbuttonB);
-
-        CHECK_GET(bf,checkbuttonBF);
-        return 1;
-}
-
-/**************************************************/
-GtkWidget*
-create_dialog1 (void)
-{
-  GtkWidget *dialog1;
-  GtkWidget *dialog_vbox1;
-  GtkWidget *vbox1;
-  GtkWidget *table1;
-  GtkWidget *label1;
-  GtkWidget *label2;
-  GtkWidget *label3;
-  GtkWidget *label4;
-  GtkObject *spinbuttonT_adj;
-  GtkWidget *spinbuttonT;
-  GtkObject *spinbuttonD_adj;
-  GtkWidget *spinbuttonD;
-  GtkObject *spinbuttonB_adj;
-  GtkWidget *spinbuttonB;
-  GtkWidget *checkbuttonBF;
-  GtkWidget *hscale1;
-  GtkWidget *drawingarea1;
-  GtkWidget *dialog_action_area1;
-  GtkWidget *cancelbutton1;
-  GtkWidget *okbutton1;
-
-  dialog1 = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog1), QT_TR_NOOP("ASharp by MarcFD"));
-
-  dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
-  gtk_widget_show (dialog_vbox1);
-
-  vbox1 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox1);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
-
-  table1 = gtk_table_new (4, 2, FALSE);
-  gtk_widget_show (table1);
-  gtk_box_pack_start (GTK_BOX (vbox1), table1, TRUE, TRUE, 0);
-
-  label1 = gtk_label_new (QT_TR_NOOP("Threshold :"));
-  gtk_widget_show (label1);
-  gtk_table_attach (GTK_TABLE (table1), label1, 0, 1, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);
-
-  label2 = gtk_label_new (QT_TR_NOOP("Strength :"));
-  gtk_widget_show (label2);
-  gtk_table_attach (GTK_TABLE (table1), label2, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
-
-  label3 = gtk_label_new (QT_TR_NOOP("Block Adaptative :"));
-  gtk_widget_show (label3);
-  gtk_table_attach (GTK_TABLE (table1), label3, 0, 1, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label3), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5);
-
-  label4 = gtk_label_new (QT_TR_NOOP("Unknown flag :"));
-  gtk_widget_show (label4);
-  gtk_table_attach (GTK_TABLE (table1), label4, 0, 1, 3, 4,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label4), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
-
-  spinbuttonT_adj = gtk_adjustment_new (1, -1, 100, 0.5, 0.1, 0.1);
-  spinbuttonT = gtk_spin_button_new (GTK_ADJUSTMENT (spinbuttonT_adj), 1, 1);
-  gtk_widget_show (spinbuttonT);
-  gtk_table_attach (GTK_TABLE (table1), spinbuttonT, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbuttonT), TRUE);
-
-  spinbuttonD_adj = gtk_adjustment_new (1, -1, 100, 0.5, 0.1, 0.1);
-  spinbuttonD = gtk_spin_button_new (GTK_ADJUSTMENT (spinbuttonD_adj), 1, 1);
-  gtk_widget_show (spinbuttonD);
-  gtk_table_attach (GTK_TABLE (table1), spinbuttonD, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbuttonD), TRUE);
-
-  spinbuttonB_adj = gtk_adjustment_new (1, -1, 100, 0.5, 0.1, 0.1);
-  spinbuttonB = gtk_spin_button_new (GTK_ADJUSTMENT (spinbuttonB_adj), 1, 1);
-  gtk_widget_show (spinbuttonB);
-  gtk_table_attach (GTK_TABLE (table1), spinbuttonB, 1, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbuttonB), TRUE);
-
-  checkbuttonBF = gtk_check_button_new_with_mnemonic (QT_TR_NOOP(" "));
-  gtk_widget_show (checkbuttonBF);
-  gtk_table_attach (GTK_TABLE (table1), checkbuttonBF, 1, 2, 3, 4,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  hscale1 = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 1, 1)));
-  gtk_widget_show (hscale1);
-  gtk_box_pack_start (GTK_BOX (vbox1), hscale1, TRUE, TRUE, 0);
-
-  drawingarea1 = gtk_drawing_area_new ();
-  gtk_widget_show (drawingarea1);
-  gtk_box_pack_start (GTK_BOX (vbox1), drawingarea1, TRUE, TRUE, 0);
-
-  dialog_action_area1 = GTK_DIALOG (dialog1)->action_area;
-  gtk_widget_show (dialog_action_area1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-
-  cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), cancelbutton1, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT);
-
-  okbutton1 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), okbutton1, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog1, "dialog1");
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog_vbox1, "dialog_vbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, vbox1, "vbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, table1, "table1");
-  GLADE_HOOKUP_OBJECT (dialog1, label1, "label1");
-  GLADE_HOOKUP_OBJECT (dialog1, label2, "label2");
-  GLADE_HOOKUP_OBJECT (dialog1, label3, "label3");
-  GLADE_HOOKUP_OBJECT (dialog1, label4, "label4");
-  GLADE_HOOKUP_OBJECT (dialog1, spinbuttonT, "spinbuttonT");
-  GLADE_HOOKUP_OBJECT (dialog1, spinbuttonD, "spinbuttonD");
-  GLADE_HOOKUP_OBJECT (dialog1, spinbuttonB, "spinbuttonB");
-  GLADE_HOOKUP_OBJECT (dialog1, checkbuttonBF, "checkbuttonBF");
-  GLADE_HOOKUP_OBJECT (dialog1, hscale1, "hscale1");
-  GLADE_HOOKUP_OBJECT (dialog1, drawingarea1, "drawingarea1");
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog_action_area1, "dialog_action_area1");
-  GLADE_HOOKUP_OBJECT (dialog1, cancelbutton1, "cancelbutton1");
-  GLADE_HOOKUP_OBJECT (dialog1, okbutton1, "okbutton1");
-
-  return dialog1;
-}
-#endif
-uint8_t DIA_getASharp(asharp *param, ADM_coreVideoFilter *in)
-{
-    return 1;
-}
-uint8_t    flyASharp::download(void) {return 1;}
-uint8_t    flyASharp::upload(void) {return 1;}
-// EOF
\ No newline at end of file

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/gtk Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/gtk/DIA_chromaShift.cpp Deleted

@@ -1,33 +0,0 @@
-/***************************************************************************
-                          ADM_guiChromaShift.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 24 2003
-    copyright            : (C) 2002-2003 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "ADM_toolkitGtk.h"
-#include "ADM_image.h"
-#include "DIA_flyDialog.h"
-#include "../chromashift.h"
-#include "DIA_factory.h"
-#include "../DIA_flyChromaShift.h"
-
-uint8_t DIA_getChromaShift( ADM_coreVideoFilter *instream,chromashift    *param )
-{
-    int w=instream->getInfo()->width/2;
-    diaElemInteger  u(&(param->u),QT_TR_NOOP("U :"),-w,w);
-    diaElemInteger  v(&(param->v),QT_TR_NOOP("V :"),-w,w);
-    diaElem *elems[]={&u,&v};
-    return diaFactoryRun("ChromaShift",sizeof(elems)/sizeof(diaElem *),elems);
-}
-uint8_t    flyChromaShift::download(void) {return 1;}
-uint8_t    flyChromaShift::upload(void) {return 1;}
\ No newline at end of file

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/DIA_flyContrast.cpp Deleted

@@ -1,63 +0,0 @@
-/***************************************************************************
-                          ADM_guiContrast.cpp  -  description
-                             -------------------
-    begin                : Mon Sep 23 2002
-    copyright            : (C) 2002 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "DIA_flyDialog.h"
-#include "ADM_default.h"
-#include "ADM_image.h"
-
-#include "ADM_vidContrast.h"
-#include "contrast.h"
-
-#include "DIA_flyContrast.h"
-
-/************* COMMON PART *********************/
-uint8_t  flyContrast::update(void)
-{
-    return 1;
-}
-// Ugly !
-static uint8_t tableluma[256], tablechroma[256];
-/**
-    \fn processYuv
-*/
-uint8_t    flyContrast::processYuv(ADMImage* in, ADMImage *out)
-{
-    buildContrastTable (param.coef, param.offset, tableluma, tablechroma);
-
-
-    out->copyInfo(in);
-
-    if(param.doLuma)
-        doContrast(in,out,tableluma,PLANAR_Y);
-    else
-        out->copyPlane(in,out,PLANAR_Y);
-
-
-    if(param.doChromaU)
-        doContrast(in,out,tablechroma,PLANAR_U);
-    else
-        out->copyPlane(in,out,PLANAR_U);
-
-    if(param.doChromaV)
-        doContrast(in,out,tablechroma,PLANAR_V);
-    else
-        out->copyPlane(in,out,PLANAR_V);
-
-    return 1;
-}
-/************* COMMON PART *********************/
-//EOF
-

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/DIA_flyContrast.h Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/DIA_flyCrop.cpp Deleted

@@ -1,234 +0,0 @@
-/***************************************************************************
-                          DIA_flyCrop.cpp  -  description
-                             -------------------
-
-        Common part of the crop dialog
-    
-    copyright            : (C) 2002/2007 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "DIA_flyDialog.h"
-#include "ADM_default.h"
-#include "ADM_image.h"
-#include "DIA_flyCrop.h"
-
-
-static uint8_t 		Metrics( uint8_t *in, uint32_t width,uint32_t *avg, uint32_t *eqt);
-static uint8_t 		MetricsV( uint8_t *in, uint32_t width,uint32_t height,uint32_t *avg, uint32_t *eqt);
-/**
-    \fn process
-	\brief 
-*/
-uint8_t    flyCrop::processRgb(uint8_t *imageIn, uint8_t *imageOut)
-{
-        uint32_t x,y;
-        uint8_t  *in;
-        uint32_t w=_w,h=_h;
-  
-        
-        memcpy(imageOut,imageIn,_w*_h*4);
-        in=imageOut;
-        for(y=0;y<top;y++)
-        {
-                for(x=0;x<w;x++)
-                {
-                        *in++=0;
-                        
-                        
-                        *in++=0xff;
-                        
-                        *in++=0;
-                        *in++=0;
-                }
-        }
-        // bottom
-        in=imageOut+(w*4)*(h-bottom);
-        for(y=0;y<bottom;y++)
-        {
-                for(x=0;x<w;x++)
-                {
-                        *in++=0;
-                        
-                        
-                        *in++=0xff;
-                        *in++=0;
-                        *in++=0;
-                }
-        }
-        // left
-        in=imageOut;
-        uint32_t stride=4*w-4;
-        for(y=0;y<h;y++)
-        {
-                for(x=0;x<left;x++)
-                {
-                        *(in+4*x)=0;
-                        
-                        
-                        *(in+4*x+1)=0xff;
-                        *(in+4*x+2)=0;
-                        *(in+4*x+3)=0;
-                }
-                for(x=0;x<right;x++)
-                {
-                        *(in-4*x+stride-4)=0;
-                        
-                        
-                        *(in-4*x+stride-3)=0xff;
-                        *(in-4*x+stride-2)=0;
-                        *(in-4*x+stride-1)=0;
-                        
-                }
-                in+=4*w;
-  
-        }
-        return true;
-
-}
-
-/**
-     \fn autocrop
-	\brief 
-*/
-
-uint8_t  flyCrop::autocrop(void)
-{
-uint8_t *in;
-uint32_t y,avg,eqt;
-	// Top
-
-#define THRESH_AVG   30
-#define THRESH_EQT   50
-        
-        in=_yuvBuffer->GetReadPtr(PLANAR_Y);
-        for(y=0;y<((_h>>1)-2);y++)	
-        {
-                Metrics(in,_w,&avg,&eqt);
-                in+=_w;
-                //printf("LineT :%d avg: %d eqt: %d\n",y,avg,eqt);
-                if(avg> THRESH_AVG || eqt > THRESH_EQT)
-                        break;
-        }
-//gotcha_:	
-        if(y)
-                top=y-1;
-        else 
-                top=0;
-                
-        in=_yuvBuffer->GetReadPtr(PLANAR_Y)+_w*(_h-1);
-        for(y=0;y<((_h>>1)-2);y++)	
-        {
-                Metrics(in,_w,&avg,&eqt);
-                in-=_w;
-                //printf("Line B :%d avg: %d eqt: %d\n",y,avg,eqt);
-                if(avg> THRESH_AVG || eqt > THRESH_EQT)
-                                break;
-        }
-//gotcha_:	
-        if(y)
-                bottom=y-1;
-        else
-                bottom=0;
-
-                
-// Left
-        in=_yuvBuffer->GetReadPtr(PLANAR_Y);
-        for(y=0;y<((_w>>1)-2);y++)	
-        {
-                MetricsV(in,_w,_h,&avg,&eqt);
-                in++;
-                //printf("Line L :%d avg: %d eqt: %d\n",y,avg,eqt);
-                if(avg> THRESH_AVG || eqt > THRESH_EQT)
-                                break;
-        }
-//gotcha_:	
-        if(y)
-                left=y-1;
-        else
-                left=0;		
-// Right
-        in=_yuvBuffer->GetReadPtr(PLANAR_Y)+_w-1;
-        for(y=0;y<((_w>>1)-2);y++)	
-        {
-                MetricsV(in,_w,_h,&avg,&eqt);
-                in--;
-                //printf("Line R :%d avg: %d eqt: %d\n",y,avg,eqt);
-                if(avg> THRESH_AVG || eqt > THRESH_EQT)
-                                break;
-        }
-//gotcha_:	
-        if(y)
-                right=y-1;
-        else
-                right=0;
-  
-              
-        // Update display
-        top=top & 0xfffe;
-        bottom=bottom & 0xfffe;
-        upload();
-        sameImage();
-        return 1;
-}
-/**
-     \fn Metrics
-	\brief Compute the average value of pixels	and eqt is the "ecart type"
-*/
-
-uint8_t Metrics( uint8_t *in, uint32_t width,uint32_t *avg, uint32_t *eqt)
-{
-
-uint32_t x;
-uint32_t sum=0,eq=0;
-uint8_t v;
-              for(x=0;x<width;x++)
-              {
-                      sum+=*(in+x);
-              }
-              sum=sum/width;
-              *avg=sum;
-              for(x=0;x<width;x++)
-              {
-                      v=*(in+x)-sum;
-                      eq+=v*v;
-              }
-              eq=eq/(width*width);
-              *eqt=eq;
-              return 1;
-}
-/**
-     \fn MetricsV
-	\brief Compute the average value of pixels	and eqt is the "ecart type"
-*/
-uint8_t MetricsV( uint8_t *in,uint32_t width, uint32_t height,uint32_t *avg, uint32_t *eqt)
-{
-
-uint32_t x;
-uint32_t sum=0,eq=0;
-uint8_t v;
-              for(x=0;x<height;x++)
-              {
-                      sum+=*(in+x*width);
-              }
-              sum=sum/height;
-              *avg=sum;
-              for(x=0;x<height;x++)
-              {
-                      v=*(in+x*width)-sum;
-                      eq+=v*v;
-              }
-              eq=eq/(height*height);
-              *eqt=eq;
-              return 1;
-}
-//EOF
-

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/DIA_flyCrop.h Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/gtk Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/gtk/DIA_crop.cpp Deleted

@@ -1,359 +0,0 @@
-/***************************************************************************
-                          DIA_crop.cpp  -  description
-                             -------------------
-
-			    GUI for cropping including autocrop
-			    +Revisted the Gtk2 way
-			     +Autocrop now in RGB space (more accurate)
-
-    begin                : Fri May 3 2002
-    copyright            : (C) 2002/2007 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "ADM_toolkitGtk.h"
-#include "ADM_image.h"
-#include "DIA_flyDialog.h"
-#include "DIA_flyCrop.h"
-#include "../crop.h"
-
-#if 1
-static GtkWidget	*create_dialog1 (void);
-
-/* Link between UI and core */
-static gboolean 	ui_draw(GtkWidget*, cairo_t*, gpointer);
-static void 		ui_autocrop (void );
-static void 		ui_reset( void );
-static void 		ui_upload(void);
-static void  		ui_read ( void);
-static void  		ui_update ( void);
-static void 		ui_frame_changed( void );
-
-static GtkWidget *dialog=NULL;
-static GtkWidget *drawingarea1;
-static GtkWidget *buttonAutocrop;
-static GtkWidget *buttonReset;
-static GtkWidget *scale;
-static GtkWidget *spinbuttonTop;
-static GtkWidget *spinbuttonLeft;
-static GtkWidget *spinbuttonRight;
-static GtkWidget *spinbuttonBottom;
-
-/* Prevent loop when updating value */
-
-static int lock=0;
-static flyCrop *myCrop=NULL;
-/**
-    \fn DIA_getCropParams
-
-*/
-int DIA_getCropParams(const char *name, crop *param, ADM_coreVideoFilter *in)
-{
-	uint32_t width, height;
-
-	// Allocate space for green-ised video
-	width = in->getInfo()->width;
-	height = in->getInfo()->height;
-
-	uint8_t ret=0;
-
-	dialog=create_dialog1();
-	gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
-										GTK_RESPONSE_OK,
-										GTK_RESPONSE_CANCEL,
-										GTK_RESPONSE_APPLY,
-										-1);
-	gtk_register_dialog(dialog);
-	gtk_window_set_title(GTK_WINDOW(dialog), name);
-	gtk_widget_show(dialog);
-	
-#define CONNECT(x,y,z) 	g_signal_connect(x, #y, G_CALLBACK(z), NULL);
-
-	CONNECT(drawingarea1,draw,ui_draw);
-	CONNECT(buttonAutocrop,clicked,ui_autocrop);
-	CONNECT(buttonReset,clicked,ui_reset);
-	CONNECT(scale,value_changed,ui_frame_changed);
-
-#define CONNECT_SPIN(x) CONNECT(spinbutton##x, value_changed,ui_update)
-          
-	CONNECT_SPIN(Top);
-	CONNECT_SPIN(Left);
-	CONNECT_SPIN(Right);
-	CONNECT_SPIN(Bottom);
-
-	myCrop=new flyCrop(width, height,in,drawingarea1,scale);
-	myCrop->left=param->left;
-	myCrop->right=param->right;
-	myCrop->top=param->top;
-	myCrop->bottom=param->bottom;
-	myCrop->upload();	
-	myCrop->sliderChanged();	
-
-	int response;
-
-	while((response = gtk_dialog_run(GTK_DIALOG(dialog))) == GTK_RESPONSE_APPLY)
-	{
-	  ui_update();
-	}
-
-	if(response==GTK_RESPONSE_OK)
-	{
-		ui_read( );
-		param->left=myCrop->left;
-		param->right=myCrop->right;
-		param->top=myCrop->top;
-		param->bottom=myCrop->bottom;
-		ret=1;
-	}
-
-	gtk_unregister_dialog(dialog);
-	gtk_widget_destroy(dialog);
-	delete myCrop;
-	return ret;
-}
-
-/*
-      Link GTK dialog and core
-*/
-void ui_frame_changed( void )
-{
-  myCrop->sliderChanged();
-}
-void ui_update(void)
-{
-  if(lock) return;
-  myCrop->download();
-  myCrop->sameImage();
-  //myCrop->display();
-}
-/*---------------------------------------------------------------------------
-	Actually draw the working frame on screen
-*/
-gboolean ui_draw(GtkWidget*, cairo_t*, gpointer)
-{
-        myCrop->sameImage();
-}
-void ui_read (void )
-{
-        myCrop->download();
-}
-void ui_upload(void)
-{
-    myCrop->upload();
-}
-void ui_autocrop( void )
-{
-  myCrop->autocrop();
- 
-}
-void ui_reset( void )
-{
-        myCrop->left=0;
-        myCrop->right=0;
-        myCrop->bottom=0;
-        myCrop->top=0;
-        
-        myCrop->upload();
-        myCrop->sameImage();
-        //myCrop->display();
-}
-
-/*---------------------------------------------------------------------------
-	Read entried from dialog box
-*/
-
-#define SPIN_GET(x,y) {x= gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spinbutton##y)) ;}
-#define SPIN_SET(x,y)  {gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton##y),(gfloat)x) ;}
-
-
-//____________________________________
-uint8_t flyCrop::upload(void)
-{
-        lock++;
-        SPIN_SET(left,Left);
-        SPIN_SET(right,Right);
-        SPIN_SET(top,Top);
-        SPIN_SET(bottom,Bottom);
-        lock--;
-        return 1;
-}
-uint8_t flyCrop::download(void)
-{
-        int reject=0;
-        
-                        SPIN_GET(left,Left);
-                        SPIN_GET(right,Right);
-                        SPIN_GET(top,Top);
-                        SPIN_GET(bottom,Bottom);
-                        
-                        printf("%d %d %d %d\n",left,right,top,bottom);
-                        
-                        left&=0xffffe;
-                        right&=0xffffe;
-                        top&=0xffffe;
-                        bottom&=0xffffe;
-                        
-                        if((top+bottom)>_h)
-                                {
-                                        top=bottom=0;
-                                        reject=1;
-                                }
-                        if((left+right)>_w)
-                                {
-                                        left=right=0;
-                                        reject=1;
-                                }
-                        if(reject)
-                                upload();
-}
-// End common part
-//--------------------------------------------
-GtkWidget*
-create_dialog1 (void)
-{
-  GtkWidget *dialog1;
-  GtkWidget *dialog_vbox1;
-  GtkWidget *vbox1;
-  GtkWidget *table1;
-  GtkWidget *label1;
-  GtkWidget *label2;
-  GtkWidget *label3;
-  GtkWidget *label4;
-  GtkAdjustment *spinbuttonRight_adj;
-  GtkAdjustment *spinbuttonLeft_adj;
-  GtkAdjustment *spinbuttonBottom_adj;
-  GtkAdjustment *spinbuttonTop_adj;
-  GtkWidget *hbox1;
-  GtkWidget *hbox2;
-  GtkWidget *dialog_action_area1;
-  GtkWidget *applybutton1;
-  GtkWidget *cancelbutton1;
-  GtkWidget *okbutton1;
-
-  dialog1 = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog1), QT_TR_NOOP("Crop"));
-  gtk_window_set_type_hint (GTK_WINDOW (dialog1), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (dialog1));
-  gtk_widget_show (dialog_vbox1);
-
-  vbox1 = gtk_vbox_new (FALSE, 6);
-  gtk_widget_show (vbox1);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox1), 6);
-
-  drawingarea1 = gtk_drawing_area_new ();
-  gtk_widget_show (drawingarea1);
-  gtk_box_pack_start (GTK_BOX (vbox1), drawingarea1, TRUE, TRUE, 0);
-
-  scale = gtk_hscale_new (gtk_adjustment_new (0, 0, 0, 0, 0, 0));
-  gtk_widget_show (scale);
-  gtk_box_pack_start (GTK_BOX (vbox1), scale, FALSE, TRUE, 0);
-
-  table1 = gtk_table_new (2, 4, FALSE);
-  gtk_widget_show (table1);
-  gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, FALSE, 10);
-  gtk_table_set_row_spacings (GTK_TABLE (table1), 4);
-  gtk_table_set_col_spacings (GTK_TABLE (table1), 15);
-
-  label1 = gtk_label_new (QT_TR_NOOP("Crop left:"));
-  gtk_widget_show (label1);
-  gtk_table_attach (GTK_TABLE (table1), label1, 0, 1, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);
-
-  label2 = gtk_label_new (QT_TR_NOOP("Crop right:"));
-  gtk_widget_show (label2);
-  gtk_table_attach (GTK_TABLE (table1), label2, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
-
-  label3 = gtk_label_new (QT_TR_NOOP("Crop top:"));
-  gtk_widget_show (label3);
-  gtk_table_attach (GTK_TABLE (table1), label3, 2, 3, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5);
-
-  label4 = gtk_label_new (QT_TR_NOOP("Crop bottom:"));
-  gtk_widget_show (label4);
-  gtk_table_attach (GTK_TABLE (table1), label4, 2, 3, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
-
-  spinbuttonRight_adj = gtk_adjustment_new (1, 0, 1000, 1, 10, 10);
-  spinbuttonRight = gtk_spin_button_new (spinbuttonRight_adj, 1, 0);
-  gtk_widget_show (spinbuttonRight);
-  gtk_table_attach (GTK_TABLE (table1), spinbuttonRight, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  spinbuttonLeft_adj = gtk_adjustment_new (1, 0, 1000, 1, 10, 10);
-  spinbuttonLeft = gtk_spin_button_new (spinbuttonLeft_adj, 1, 0);
-  gtk_widget_show (spinbuttonLeft);
-  gtk_table_attach (GTK_TABLE (table1), spinbuttonLeft, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  spinbuttonBottom_adj = gtk_adjustment_new (1, 0, 1000, 1, 10, 10);
-  spinbuttonBottom = gtk_spin_button_new (spinbuttonBottom_adj, 1, 0);
-  gtk_widget_show (spinbuttonBottom);
-  gtk_table_attach (GTK_TABLE (table1), spinbuttonBottom, 3, 4, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  spinbuttonTop_adj = gtk_adjustment_new (1, 0, 1000, 1, 10, 10);
-  spinbuttonTop = gtk_spin_button_new (spinbuttonTop_adj, 1, 0);
-  gtk_widget_show (spinbuttonTop);
-  gtk_table_attach (GTK_TABLE (table1), spinbuttonTop, 3, 4, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  hbox1 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox1);
-  gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
-
-  hbox2 = gtk_hbox_new (TRUE, 6);
-  gtk_widget_show (hbox2);
-  gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, TRUE, 0);
-
-  buttonAutocrop = gtk_button_new_with_mnemonic (QT_TR_NOOP("Auto Crop"));
-  gtk_widget_show (buttonAutocrop);
-  gtk_box_pack_start (GTK_BOX (hbox2), buttonAutocrop, FALSE, TRUE, 0);
-
-  buttonReset = gtk_button_new_from_stock ("gtk-clear");
-  gtk_widget_show (buttonReset);
-  gtk_box_pack_start (GTK_BOX (hbox2), buttonReset, FALSE, TRUE, 0);
-
-  dialog_action_area1 = gtk_dialog_get_action_area (GTK_DIALOG (dialog1));
-  gtk_widget_show (dialog_action_area1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-
-  applybutton1 = gtk_button_new_from_stock ("gtk-apply");
-  gtk_widget_show (applybutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), applybutton1, GTK_RESPONSE_APPLY);
-
-  cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), cancelbutton1, GTK_RESPONSE_CANCEL);
-
-  okbutton1 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), okbutton1, GTK_RESPONSE_OK);
-
-  return dialog1;
-}
-
-#endif

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/DIA_flyEq2.cpp Deleted

@@ -1,79 +0,0 @@
-/***************************************************************************
-                          ADM_guiContrast.cpp  -  description
-                             -------------------
-    begin                : Mon Sep 23 2002
-    copyright            : (C) 2002 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <math.h>
-#include "DIA_flyDialog.h"
-#include "ADM_default.h"
-#include "ADM_image.h"
-
-#include "ADM_vidEq2.h"
-
-#include "DIA_flyEq2.h"
-typedef void lutMeType(oneSetting *par, ADMImage *i,ADMImage *o,ADM_PLANE plane);
-
-/************* COMMON PART *********************/
-uint8_t  flyEq2::update(void)
-{
-    return 1;
-}
-/**
-    \fn process
-*/
-uint8_t    flyEq2::processYuv(ADMImage* in, ADMImage *out)
-{
-	Eq2Settings mySettings;
-
-#if 0
-	printf("Contrast   :%f\n",param.contrast);
-	printf("brightness :%f\n",param.brightness);
-	printf("saturation :%f\n",param.saturation);
-	
-	printf("gamma_weight :%f\n",param.gamma_weight);
-	printf("gamma :%f\n",param.gamma);
-	
-	
-	
-	printf("rgamma :%f\n",param.rgamma);
-	printf("bgamma :%f\n",param.bgamma);
-	printf("ggamma :%f\n",param.ggamma);
-	printf("******************\n");
-#endif	
-	
-	        update_lut(&mySettings,&param);
-	        
-
-
-			lutMeType *lutMe=apply_lut;
-			
-
-#ifdef ADM_CPU_X86
-	        if(CpuCaps::hasMMX())
-	        {
-	        		lutMe=affine_1d_MMX;
-	        }
-#endif	
-	        lutMe(&(mySettings.param[0]),in,out,PLANAR_Y);
-            lutMe(&(mySettings.param[2]),in,out,PLANAR_U);
-            lutMe(&(mySettings.param[1]),in,out,PLANAR_V);
-	        
-	        	
-#if 1
-	        in->copyLeftSideTo(out);
-#endif
-		return 1;
-}
-
-/************* COMMON PART *********************/

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/DIA_flyEq2.h Deleted

@@ -1,35 +0,0 @@
-
-/***************************************************************************
-                        flyDialog for Eq2-Gtk
-                        (C) Mean 2007
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#ifndef FLY_EQ2_H
-#define FLY_EQ2_H
-#include "ADM_vidEq2.h"
-class flyEq2 : public FLY_DIALOG_TYPE
-{
-  
-  public:
-   eq2         param;
-  public:
-   uint8_t    processYuv(ADMImage* in, ADMImage *out);
-   uint8_t    download(void);
-   uint8_t    upload(void);
-   uint8_t    update(void);
-   			  flyEq2 (uint32_t width,uint32_t height,ADM_coreVideoFilter *in, void *canvas, void *slider) : 
-   			 FLY_DIALOG_TYPE(width, height,in,canvas, slider,1,RESIZE_AUTO)
-                    {
-                      
-                    };
-};
-
-#endif

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/gtk Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/gtk/DIA_eq2.cpp Deleted

@@ -1,37 +0,0 @@
-/***************************************************************************
-                           Fly-Ui for hue & sat
-
-    copyright            : (C) 2004/5/7 by mean
-    email                : fixounet@free.fr
-    
-    
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "ADM_toolkitGtk.h"
-#include "ADM_image.h"
-#include "DIA_flyDialog.h"
-
-
-#include "ADM_vidEq2.h"
-
-#include "DIA_flyEq2.h"
-
-/**
- * 		\fn DIA_getEQ2Param
- * 		\brief flyDialogGtk handling the mplayer EQ2 user Interface dialog.
- */
-uint8_t DIA_getEQ2Param(eq2 *param, ADM_coreVideoFilter *in)
-{
-    return false;
-}
-uint8_t    flyEq2::download(void) {return 1;}
-uint8_t    flyEq2::upload(void) {return 1;}
-

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/DIA_flyHue.cpp Deleted

@@ -1,66 +0,0 @@
-/**/
-/***************************************************************************
-                          DIA_hue
-                             -------------------
-
-			   Ui for hue & sat
-
-    begin                : 08 Apr 2005
-    copyright            : (C) 2004/7 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "DIA_flyDialog.h"
-#include "ADM_default.h"
-#include "ADM_image.h"
-#include "DIA_flyHue.h"
-
-#include "ADM_assert.h"
-// FIXME
-#ifndef M_PI
-#define M_PI    3.14159265358979323846
-#endif
-extern void HueProcess_C( uint8_t *udst, uint8_t *vdst, 
-                            uint8_t *usrc, uint8_t *vsrc, 
-                            int dststride, int srcstride,   
-                            int w, int h, float hue, float sat);
-
-/************* COMMON PART *********************/
-uint8_t  flyHue::update(void)
-{
-    return 1;
-}        
-/**
-    \fn processYuv
-*/
-uint8_t   flyHue::processYuv(ADMImage *in,ADMImage *out )
-{
-uint8_t *src,*dst;
-uint32_t stride;
-float hue,sat;
-    hue=param.hue*M_PI/180.;
-    sat=(100+param.saturation)/100.;
-    out->copyPlane(in,out,PLANAR_Y);
-   
-    // Do it!
-    HueProcess_C(out->GetWritePtr(PLANAR_V), out->GetWritePtr(PLANAR_U),
-                 in->GetReadPtr(PLANAR_V), in->GetReadPtr(PLANAR_U),
-                 out->GetPitch(PLANAR_U),in->GetPitch(PLANAR_U), // assume u&v pitches are =
-                 in->GetWidth(PLANAR_U),in->GetHeight(PLANAR_U),
-                 hue, sat);
-    // Copy half source to display
-    in->copyLeftSideTo(out);
-    out->printString(1,1,QT_TRANSLATE_NOOP("hue","Original"));
-    out->printString(in->GetWidth(PLANAR_Y)/24+1,1,QT_TRANSLATE_NOOP("hue","Processed"));
-
-    return 1;
-}
-//EOF

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/DIA_flyHue.h Deleted

@@ -1,35 +0,0 @@
-/***************************************************************************
-  \fn     DIA_flyHue
-  \author (C) 2004/2012 by mean/fixounet@free.fr
-  \brief  Ui for hue & sat
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#ifndef FLY_HUE_H
-#define FLY_HUE_H
-#include "hue.h"
-/**
-    \class flyHue
-*/
-
-class flyHue : public FLY_DIALOG_TYPE
-{
-  
-  public:
-   hue  param;
-  public:
-   uint8_t    processYuv(ADMImage* in, ADMImage *out);
-   uint8_t    download(void);
-   uint8_t    upload(void);
-   uint8_t    update(void);
-   flyHue (uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
-                                    void *canvas, void *slider) : FLY_DIALOG_TYPE(width, height,in,canvas, slider,1,RESIZE_AUTO) {};
-};
-#endif

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/gtk Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/gtk/DIA_hue.cpp Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/DIA_flyMpDelogo.cpp Deleted

@@ -1,76 +0,0 @@
-/**/
-/***************************************************************************
-                          DIA_flyMpDelogo
-                             -------------------
-
-                           Ui for MPlayer DeLogo filter
-
-    begin                : 08 Apr 2005
-    copyright            : (C) 2004/5 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "DIA_flyDialog.h"
-#include "ADM_default.h"
-#include "ADM_image.h"
-
-
-#include "delogo.h"
-#include "DIA_flyMpDelogo.h"
-#include "ADM_vidMPdelogo.h"
-
-
-/************* COMMON PART *********************/
-/**
-    \fn process
-*/
-uint8_t    flyMpDelogo::processYuv(ADMImage* in, ADMImage *out)
-{
-    out->duplicate(in);
-    if(preview)
-        MPDelogo::doDelogo(out, param.xoff, param.yoff,
-                             param.lw,  param.lh,param.band,param.show);        
-    else
-    {
-        uint8_t *y=out->GetWritePtr(PLANAR_Y);
-        int stride=out->GetPitch(PLANAR_Y);
-        int mx=param.lw+param.xoff;
-        int my=param.lh+param.yoff;
-        if(mx>=out->GetWidth(PLANAR_Y)) mx=out->GetWidth(PLANAR_Y)-1;
-        if(my>=out->GetHeight(PLANAR_Y)) my=out->GetHeight(PLANAR_Y)-1;
-        
-        
-        // hz
-        uint8_t *p=y+stride*param.yoff;
-        uint8_t *p2=y+stride*(my);
-        
-        uint8_t toggle=0;
-        for(int x=param.xoff;x<mx;x++)
-        {
-            *(p+x)=toggle;
-            toggle=0xff^toggle;
-            *(p2+x)=toggle;
-        }
-        // vz
-         p=y+stride*(param.yoff)+param.xoff;
-         p2=y+stride*(param.yoff)+mx;
-         
-         for(int yy=param.yoff;yy<my;yy++)
-         {
-            *(p)=toggle;
-            toggle=0xff^toggle;
-            *(p2)=toggle;
-            p+=stride;   p2+=stride;
-         }
-    }
-    return 1;
-}
-//EOF

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/DIA_flyMpDelogo.h Deleted

@@ -1,50 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2011 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-
-#ifndef FLY_MPDELOGO_H
-#define FLY_MPDELOGO_H
-/**
-    \class flyASharp
-*/
-#include "delogo.h"
-/**
-    \class flyMpDelogo
-*/
-class flyMpDelogo : public FLY_DIALOG_TYPE
-{
-  
-  public:
-   delogo      param;
-   bool        preview;
-  public:
-   uint8_t     processYuv(ADMImage* in, ADMImage *out);
-   uint8_t     download(void);
-   uint8_t     upload(void);
-               flyMpDelogo (uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
-                                    void *canvas, void *slider) : 
-                FLY_DIALOG_TYPE(width, height,in,canvas, slider,true,RESIZE_AUTO) 
-                {};
-   virtual     ~flyMpDelogo() {};
-   bool         setXy(int x,int y);
-   bool         setPreview(bool onoff)
-                {
-                    preview=onoff;
-                    return true;
-                }
-};
-// EOF
-
-
-#endif

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/gtk Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/gtk/DIA_mpdelogo.cpp Deleted

@@ -1,527 +0,0 @@
-/***************************************************************************
-                          DIA_crop.cpp  -  description
-                             -------------------
-
-			    GUI for cropping including autocrop
-			    +Revisted the Gtk2 way
-			     +Autocrop now in RGB space (more accurate)
-
-    begin                : Fri May 3 2002
-    copyright            : (C) 2002 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <math.h>
-
-#include "ADM_toolkitGtk.h"
-
-#include "ADM_image.h"
-#include "ADM_videoFilter.h"
-#include "ADM_colorspace.h"
-#include "ADM_vidMPdelogo.h"
-
-extern "C" {
-#include "libavcodec/avcodec.h"
-}
-
-static GtkWidget	*create_dialog1 (void);
-static void  		ui_read ( void);
-static void  		ui_update ( void);
-static void 		draw (GtkWidget *dialog,uint32_t w,uint32_t h );
-static gboolean 	gui_draw( void );
-static void 		autocrop (void );
-static void 		reset( void );
-static void 		ui_upload(void);
-static gboolean		ui_changed(void);
-
-
-static void		prepare(uint32_t img);
-static void 		frame_changed( void );
-
-extern void GUI_RGBDisplay(uint8_t * dis, uint32_t w, uint32_t h, void *widg);
-
-static ColYuvRgb    *rgbConv=NULL;
-static uint8_t *working=NULL;
-static uint8_t *rgbBufferDisplay=NULL;
-static uint8_t *original=NULL;
-static GtkWidget *dialog=NULL;
-static uint32_t x,y,w,h,zoomW,zoomH,band;
-
-static AVDMGenericVideoStream *incoming=NULL;
-static ADMImage *imgsrc=NULL;
-static ADMImageResizer *resizer=NULL;
-
-static int lock=0,width,height;
-
-
-//
-//	Video is in YV12 Colorspace
-//
-//
-uint8_t DIA_getMPdelogo(MPDELOGO_PARAM *param,AVDMGenericVideoStream *in)
-
-{
-	// Allocate space for green-ised video
-	width=in->getInfo()->width;
-	height=in->getInfo()->height;
-		
-	working=new uint8_t [width*height*4];	
-	original=NULL;
-
-	uint8_t ret=0;
-
-	dialog=create_dialog1();
-
-	gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
-										GTK_RESPONSE_OK,
-										GTK_RESPONSE_CANCEL,
-										-1);
-
-	gtk_register_dialog(dialog);
-	
-	x=param->xoff;
-	y=param->yoff;
-	w=param->lw;
-	h=param->lh;
-	band=param->band;
-
-	imgsrc=new ADMImage(width,height);
-	incoming=in;
-	
-	rgbConv=new ColYuvRgb(width,height);
-        rgbConv->reset(width,height);
-
-	float zoom = UI_calcZoomToFitScreen(GTK_WINDOW(dialog), WID(drawingarea1), width, height);
-
-	zoomW = width * zoom;
-	zoomH = height * zoom;
-	rgbBufferDisplay=new uint8_t[zoomW*zoomH*4];
-
-	gtk_widget_set_usize(WID(drawingarea1), zoomW, zoomH);
-
-	if (zoom < 1)
-	{
-		UI_centreCanvasWindow((GtkWindow*)dialog, WID(drawingarea1), zoomW, zoomH);
-		resizer = new ADMImageResizer(width, height, zoomW, zoomH, PIX_FMT_RGB32, PIX_FMT_RGB32);
-	}
-
-	prepare(0);
-	gtk_widget_show(dialog);
-	
-	ui_upload();
-	ui_update();
-	
-#define CONNECT(x,y,z) 	gtk_signal_connect(GTK_OBJECT(WID(x)), #y,GTK_SIGNAL_FUNC(z),   NULL);
-
-        CONNECT(drawingarea1,expose_event,gui_draw);
-        CONNECT(hscale1,value_changed,frame_changed);	  
-		      
-#define CONNECT_SPIN(x) CONNECT(spinbutton##x, value_changed,ui_changed)
-      	  
-        CONNECT_SPIN(X);
-        CONNECT_SPIN(Y);
-        CONNECT_SPIN(W);
-        CONNECT_SPIN(H);
-        CONNECT_SPIN(Band);
-	  
-	draw(dialog,width,height);
-
-	ret=0;
-	int response;
-	while( (response=gtk_dialog_run(GTK_DIALOG(dialog)))==GTK_RESPONSE_APPLY)
-	{
-		ui_changed();
-		
-	}
-	if(response==GTK_RESPONSE_OK)
-        {
-		ui_read( );
-		param->xoff=x;
-                param->yoff=y;
-                param->lw=w;
-                param->lh=h;
-                param->band=band;
-		ret=1;
-	}
-        gtk_unregister_dialog(dialog);
-	gtk_widget_destroy(dialog);
-	delete working;	
-	delete imgsrc;
-	delete rgbConv;
-
-	if (resizer)
-	{
-		delete resizer;
-		delete[] rgbBufferDisplay;
-
-		resizer=NULL;
-		rgbBufferDisplay=NULL;
-	}
-
-	working=NULL;
-	dialog=NULL;
-	original=NULL;
-	imgsrc=NULL;
-	return ret;
-}
-void frame_changed( void )
-{
-uint32_t new_frame,max,l,f;
-double   percent;
-GtkWidget *wid;	
-GtkAdjustment *adj;
-
-        max=incoming->getInfo()->nb_frames;
-        wid=WID(hscale1);
-        adj=gtk_range_get_adjustment (GTK_RANGE(wid));
-        new_frame=0;
-        
-        percent=(double)GTK_ADJUSTMENT(adj)->value;
-        percent*=max;
-        percent/=100.;
-        new_frame=(uint32_t)floor(percent);
-        
-        if(new_frame>=max) new_frame=max-1;
-        
-        prepare(new_frame);
-        ui_update();
-        gui_draw();
-
-
-}
-void prepare(uint32_t img)
-{
-	uint32_t l,f;
-	
-	ADM_assert(incoming->getFrameNumberNoAlloc(img,&l,imgsrc,&f));
-	original=imgsrc->data;
-	
-
-}
-gboolean ui_changed(void)
-{
-	if(!lock)
-	{
-		ui_read();
-		memcpy(working,original,(width*height*3)>>1);
-		ui_update();
-		draw(dialog,width,height);
-	}
-		return true;
-}
-
-
-/*---------------------------------------------------------------------------
-	Actually draw the working frame on screen
-*/
-gboolean gui_draw( void )
-{
-	draw(dialog,width,height);
-	return true;
-}
-void draw (GtkWidget *dialog,uint32_t w,uint32_t h )
-{
-	GtkWidget *draw=WID(drawingarea1);
-
-	if (resizer)
-	{
-		resizer->resize(working, rgbBufferDisplay);
-		GUI_RGBDisplay(rgbBufferDisplay, zoomW, zoomH, (void*)draw);
-	}
-	else
-		GUI_RGBDisplay(working, w, h, (void*)draw);
-}
-/*---------------------------------------------------------------------------
-	Read entried from dialog box
-*/
-
-#define SPIN_GET(x,y) {x= gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(WID(spinbutton##y))) ;}
-#define SPIN_SET(x,y)  {gtk_spin_button_set_value(GTK_SPIN_BUTTON(WID(spinbutton##y)),(gfloat)x) ;}
-
-
-void ui_read (void )
-{
-	int reject=0;
-	
-			SPIN_GET(x,X);
-			SPIN_GET(y,Y);
-			SPIN_GET(h,H);
-			SPIN_GET(w,W);
-                        SPIN_GET(band,Band);
-			
-			//printf("%d %d %d %d\n",x,y,w,h);
-			
-			x&=0xffffe;
-			y&=0xffffe;
-			h&=0xffffe;
-			w&=0xffffe;
-			
-			if((x+w)>width)
-				{
-                                        if(w>=width) w=width;
-                                        x=width-w;
-                                        reject=1;
-				}
-			if((y+h)>height)
-				{
-                                        if(h>=height) h=height;
-                                        y=height-h;
-                                        reject=1;
-				}
-			if(reject)
-				ui_upload();
-}
-
-void ui_upload(void)
-{
-	lock++;
-	SPIN_SET(x,X);
-	SPIN_SET(y,Y);
-	SPIN_SET(w,W);
-	SPIN_SET(h,H);
-        SPIN_SET(band,Band);
-	lock--;
-}
-//____________________________________
-void reset( void )
-{
-	
-	x=y=w=h=0;
-	ui_upload();
-	ui_update();
-	gui_draw();
-	
-
-}
-/*---------------------------------------------------------------------------
-	Green-ify the displayed frame on cropped parts
-*/
-void ui_update( )
-{
-
-        uint8_t  *in,*in2;
-        uint8_t *buffer=working;
-
-        rgbConv->scale(original,buffer);
-        // Buffer is in RGB space
-        in=buffer+x*4+y*width*4;
-        in2=buffer+(x+w)*4+y*width*4;
-        
-        for(int yy=0;yy<h;yy++)
-        {
-          in[0]=in[2]=0;in[1]=0xff;
-          in2[0]=in2[2]=0;in2[1]=0xff;
-          in+=width*4;
-          in2+=width*4;
-        }
-        in=buffer+(y*width+x)*4;
-        in2=buffer+((y+h)*width+x)*4;
-        for(int yy=0;yy<w;yy++)
-        {
-          in[0]=in[2]=0;in[1]=0xff;
-          in2[0]=in2[2]=0;in2[1]=0xff;
-          in+=4;
-          in2+=4;
-        }
-
-}
-
-//--------------------------------------------
-GtkWidget*
-create_dialog1 (void)
-{
-  GtkWidget *dialog1;
-  GtkWidget *dialog_vbox1;
-  GtkWidget *vbox1;
-  GtkWidget *vbox2;
-  GtkWidget *table2;
-  GtkWidget *label3;
-  GtkWidget *label4;
-  GtkWidget *label5;
-  GtkWidget *label6;
-  GtkWidget *label7;
-  GtkObject *spinbuttonX_adj;
-  GtkWidget *spinbuttonX;
-  GtkObject *spinbuttonY_adj;
-  GtkWidget *spinbuttonY;
-  GtkObject *spinbuttonW_adj;
-  GtkWidget *spinbuttonW;
-  GtkObject *spinbuttonH_adj;
-  GtkWidget *spinbuttonH;
-  GtkWidget *hseparator1;
-  GtkWidget *hseparator2;
-  GtkObject *spinbuttonBand_adj;
-  GtkWidget *spinbuttonBand;
-  GtkWidget *hseparator3;
-  GtkWidget *hscale1;
-  GtkWidget *drawingarea1;
-  GtkWidget *dialog_action_area1;
-  GtkWidget *cancelbutton1;
-  GtkWidget *okbutton1;
-
-  dialog1 = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog1), QT_TR_NOOP("Mplayer Delogo"));
-  gtk_window_set_type_hint (GTK_WINDOW (dialog1), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
-  gtk_widget_show (dialog_vbox1);
-
-  vbox1 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox1);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
-
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox2);
-  gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
-
-  table2 = gtk_table_new (3, 4, FALSE);
-  gtk_widget_show (table2);
-  gtk_box_pack_start (GTK_BOX (vbox2), table2, TRUE, TRUE, 0);
-
-  label3 = gtk_label_new (QT_TR_NOOP("X"));
-  gtk_widget_show (label3);
-  gtk_table_attach (GTK_TABLE (table2), label3, 0, 1, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5);
-
-  label4 = gtk_label_new (QT_TR_NOOP("Y"));
-  gtk_widget_show (label4);
-  gtk_table_attach (GTK_TABLE (table2), label4, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
-
-  label5 = gtk_label_new (QT_TR_NOOP("W"));
-  gtk_widget_show (label5);
-  gtk_table_attach (GTK_TABLE (table2), label5, 2, 3, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label5), 0, 0.5);
-
-  label6 = gtk_label_new (QT_TR_NOOP("H"));
-  gtk_widget_show (label6);
-  gtk_table_attach (GTK_TABLE (table2), label6, 2, 3, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label6), 0, 0.5);
-
-  label7 = gtk_label_new (QT_TR_NOOP("Band"));
-  gtk_widget_show (label7);
-  gtk_table_attach (GTK_TABLE (table2), label7, 0, 1, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label7), 0, 0.5);
-
-  spinbuttonX_adj = gtk_adjustment_new (1, 0, 2000, 1, 10, 10);
-  spinbuttonX = gtk_spin_button_new (GTK_ADJUSTMENT (spinbuttonX_adj), 1, 0);
-  gtk_widget_show (spinbuttonX);
-  gtk_table_attach (GTK_TABLE (table2), spinbuttonX, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  spinbuttonY_adj = gtk_adjustment_new (1, 0, 2000, 1, 10, 10);
-  spinbuttonY = gtk_spin_button_new (GTK_ADJUSTMENT (spinbuttonY_adj), 1, 0);
-  gtk_widget_show (spinbuttonY);
-  gtk_table_attach (GTK_TABLE (table2), spinbuttonY, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  spinbuttonW_adj = gtk_adjustment_new (1, 0, 2000, 1, 10, 10);
-  spinbuttonW = gtk_spin_button_new (GTK_ADJUSTMENT (spinbuttonW_adj), 1, 0);
-  gtk_widget_show (spinbuttonW);
-  gtk_table_attach (GTK_TABLE (table2), spinbuttonW, 3, 4, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  spinbuttonH_adj = gtk_adjustment_new (1, 0, 2000, 1, 10, 10);
-  spinbuttonH = gtk_spin_button_new (GTK_ADJUSTMENT (spinbuttonH_adj), 1, 0);
-  gtk_widget_show (spinbuttonH);
-  gtk_table_attach (GTK_TABLE (table2), spinbuttonH, 3, 4, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  hseparator1 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator1);
-  gtk_table_attach (GTK_TABLE (table2), hseparator1, 3, 4, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-  hseparator2 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator2);
-  gtk_table_attach (GTK_TABLE (table2), hseparator2, 2, 3, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-  spinbuttonBand_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
-  spinbuttonBand = gtk_spin_button_new (GTK_ADJUSTMENT (spinbuttonBand_adj), 1, 0);
-  gtk_widget_show (spinbuttonBand);
-  gtk_table_attach (GTK_TABLE (table2), spinbuttonBand, 1, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  hseparator3 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator3);
-  gtk_box_pack_start (GTK_BOX (vbox2), hseparator3, FALSE, FALSE, 0);
-
-  hscale1 = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 1, 0)));
-  gtk_widget_show (hscale1);
-  gtk_box_pack_start (GTK_BOX (vbox1), hscale1, FALSE, FALSE, 0);
-
-  drawingarea1 = gtk_drawing_area_new ();
-  gtk_widget_show (drawingarea1);
-  gtk_box_pack_start (GTK_BOX (vbox1), drawingarea1, TRUE, TRUE, 0);
-  gtk_widget_set_size_request (drawingarea1, 100, 100);
-
-  dialog_action_area1 = GTK_DIALOG (dialog1)->action_area;
-  gtk_widget_show (dialog_action_area1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-
-  cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), cancelbutton1, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT);
-
-  okbutton1 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), okbutton1, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog1, "dialog1");
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog_vbox1, "dialog_vbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, vbox1, "vbox1");
-  GLADE_HOOKUP_OBJECT (dialog1, vbox2, "vbox2");
-  GLADE_HOOKUP_OBJECT (dialog1, table2, "table2");
-  GLADE_HOOKUP_OBJECT (dialog1, label3, "label3");
-  GLADE_HOOKUP_OBJECT (dialog1, label4, "label4");
-  GLADE_HOOKUP_OBJECT (dialog1, label5, "label5");
-  GLADE_HOOKUP_OBJECT (dialog1, label6, "label6");
-  GLADE_HOOKUP_OBJECT (dialog1, label7, "label7");
-  GLADE_HOOKUP_OBJECT (dialog1, spinbuttonX, "spinbuttonX");
-  GLADE_HOOKUP_OBJECT (dialog1, spinbuttonY, "spinbuttonY");
-  GLADE_HOOKUP_OBJECT (dialog1, spinbuttonW, "spinbuttonW");
-  GLADE_HOOKUP_OBJECT (dialog1, spinbuttonH, "spinbuttonH");
-  GLADE_HOOKUP_OBJECT (dialog1, hseparator1, "hseparator1");
-  GLADE_HOOKUP_OBJECT (dialog1, hseparator2, "hseparator2");
-  GLADE_HOOKUP_OBJECT (dialog1, spinbuttonBand, "spinbuttonBand");
-  GLADE_HOOKUP_OBJECT (dialog1, hseparator3, "hseparator3");
-  GLADE_HOOKUP_OBJECT (dialog1, hscale1, "hscale1");
-  GLADE_HOOKUP_OBJECT (dialog1, drawingarea1, "drawingarea1");
-  GLADE_HOOKUP_OBJECT_NO_REF (dialog1, dialog_action_area1, "dialog_action_area1");
-  GLADE_HOOKUP_OBJECT (dialog1, cancelbutton1, "cancelbutton1");
-  GLADE_HOOKUP_OBJECT (dialog1, okbutton1, "okbutton1");
-
-  return dialog1;
-}
-
-

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/gtk Deleted

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/gtk/gtk_resize.cpp Deleted

@@ -1,452 +0,0 @@
-/*
-	Resize GUI
-
-*/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <math.h>
-
-#include "ADM_toolkitGtk.h"
-#include "ADM_default.h"
-#define aprintf(...) {}
-#include "swresize.h"
-#include <gtk/gtk.h>
-
-#define FILL_ENTRY(widget_name,string) 		{r=-1;   \
-gtk_editable_delete_text(GTK_EDITABLE(widget_name), 0,-1);\
-gtk_editable_insert_text(GTK_EDITABLE(widget_name), string, strlen(string), &r);}
-#define CHECKBOX(x,y) if(TRUE==gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(x)))  \
-			y=1; else y=0;
-#define READ_ENTRY(widget_name)   gtk_editable_get_chars(GTK_EDITABLE (widget_name), 0, -1);
-
-#define SPIN_GET(x,y) {y= gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(x)) ;}
-#define SPIN_SET(x,y)  {gtk_spin_button_set_value(GTK_SPIN_BUTTON(x),(gfloat)y) ;}
-
-
-/*----------------------------------------------*/
-static GtkWidget	*create_dialog1 (void);
-static void drag(GtkWidget * scale, gpointer user_data);
-static void read (void );
-static void write (void );
-/*----------------------------------------------*/
-static GtkWidget *dialog;
-static GtkWidget *menu_algo;
-static GtkWidget *menu_source;
-static GtkWidget *menu_dest;
-static GtkWidget *hscale1;
-static GtkWidget *checkbutton1;
-static GtkWidget *label_errorx;
-static GtkWidget *label_errory;
-static GtkWidget *spinbutton_width;
-static GtkWidget *spinbutton_height;
-static uint32_t iw,ih,ow,oh;
-static GtkAdjustment *adj_angle;
-static gint  r;
-static int sar;
-static int dar;
-static int resizeMethod;
-static int roundBool;
-static float erx,ery;
-static double aspectRatio[2][3]={
-								{1.,0.888888,1.19}, // NTSC 1:1 4:3 16:9
-								{1.,1.066667,1.43} // PAL  1:1 4:3 16:9
-							};
-static int pal=1;
-/**
-    \fn DIA_resize
-    \brief Dialog for resizer, gtk flavor
-*/
-bool         DIA_resize(uint32_t originalWidth,uint32_t originalHeight,uint32_t fps1000,swresize *resize)
-{
-	char str[100];
-	uint8_t ret=0;
-
-
-	if(fps1000>24600 && fps1000<25400)
-	{
-		aprintf("Pal\n");
-		pal=1;
-	}
-	else
-	{
-		aprintf("NTSC\n");
-		pal=0;
-	}
-
-	ow=originalWidth;
-	oh=originalHeight;
-
-	iw=resize->width;
-	ih=resize->height;
-	dialog=create_dialog1();
-	//gtk_transient(dialog);
-        gtk_register_dialog(dialog);
-	erx=ery=0;
-
-	double val;
-	val=100.*iw;
-	if(ow) val=val/ow;
-	adj_angle=gtk_range_get_adjustment (GTK_RANGE(hscale1));
-	gtk_adjustment_set_value( GTK_ADJUSTMENT(adj_angle),(  gdouble  ) val );
-
-	// remember algo
-	gtk_combo_box_set_active (GTK_COMBO_BOX (menu_algo), resize->algo);
-    gtk_combo_box_set_active (GTK_COMBO_BOX (menu_source), resize->sourceAR);
-    gtk_combo_box_set_active (GTK_COMBO_BOX (menu_dest), resize->targetAR);
-
-
-	#define CONNECT(w,x) g_signal_connect(w, #x, G_CALLBACK(drag), NULL)
-
-			CONNECT(hscale1,drag_data_received);
-			CONNECT(hscale1,drag_motion);
-			CONNECT(hscale1,drag_data_get);
-			CONNECT(hscale1,drag_begin);
-
-			g_signal_connect(adj_angle,"value_changed", G_CALLBACK(drag), NULL);
-
-	write();
-
-	ret=0;
-	uint8_t stop=0;
-	while(!stop)
-	{
-		switch(gtk_dialog_run(GTK_DIALOG(dialog)))
-		{
-			case GTK_RESPONSE_OK:
-				gchar *s;
-
-                SPIN_GET(spinbutton_width,resize->width);
-                SPIN_GET(spinbutton_height,resize->height);
-                resize->algo= gtk_combo_box_get_active(GTK_COMBO_BOX(menu_algo));
-                resize->sourceAR=gtk_combo_box_get_active(GTK_COMBO_BOX(menu_source));
-                resize->targetAR=gtk_combo_box_get_active(GTK_COMBO_BOX(menu_dest));
-				ret=1;
-				stop=1;
-				break;
-		default:			
-		case GTK_RESPONSE_CANCEL:
-				stop=1;
-				break;
-		case GTK_RESPONSE_APPLY:
-				drag(NULL,NULL);
-				break;
-							
-		}
-
-	}
-    gtk_unregister_dialog(dialog);
-	gtk_widget_destroy(dialog);
-
-	return ret;
-}
-/*
-	Called when the hscale is changed
-*/
-void drag(GtkWidget * scale, gpointer user_data)
-{
-  UNUSED_ARG(scale);
-  UNUSED_ARG(user_data);
-
-  double percent;
-  float x,y;
-  float sr_mul,dst_mul;
-
- int32_t xx,yy;
-
-
-
-  percent = gtk_adjustment_get_value (adj_angle);
-  if(percent<10.0) percent=10.;
-  read();
-
-  aprintf("drag called : %f \n",percent);
-  x=ow;
-  y=oh;
- erx=0;
- ery=0;
-  sr_mul=1.;
-  if(sar)
-  	{  // source is 4/3 or 16/9
-			sr_mul=aspectRatio[pal][sar];
-
-	}
-
-dst_mul=1.;
-  if(dar)
-  	{  // dst is 4/3 or 16/9
-
-			dst_mul=1/aspectRatio[pal][dar];
-	}
-	aprintf("source mul %02.2f , dst mul : %02.2f\n",sr_mul,dst_mul);
-	x=x*sr_mul*dst_mul;
-	y=y*1;
-
-	// normalize it to recover 100% width
-	y=y/(x/ow);
-	x=ow;
-
-	aprintf("AR:x,y  : %03f %03f \n",x,y);
-
-  	percent/=100.;
-  	x=x*percent;
-  	y=y*percent;
-
-
-	aprintf("AR x,y  : %03f %03f \n",x,y);
-  	xx=(uint32_t)floor(x+0.5);
-	yy=(uint32_t)floor(y+0.5);
-
-	if(xx&1) xx--;
-	if(yy&1) yy--;
-
-
-	if(roundBool)
-	{
-		int32_t ox=xx,oy=yy;
-		xx=(xx +7) & 0xfffff0;
-		yy=(yy +7) & 0xfffff0;
-
-		erx=(xx-ox);
-		erx=erx/xx;
-		ery=(yy-oy);
-		ery=ery/yy;
-
-		aprintf("x: %d -> %d : err %f\n",ox,xx,erx);
-		aprintf("y: %d -> %d : err %f\n",oy,yy,ery);
-	}
-
-	iw=xx;
-	ih=yy;
-	write();
-  }
-//---------------------------------------------
-// 	read all value from dialog
-//---------------------------------------------
-void read (void )
-{
-	// Read source and dest aspect ratio
- 	sar=gtk_combo_box_get_active(GTK_COMBO_BOX(menu_source));
-	dar=gtk_combo_box_get_active(GTK_COMBO_BOX(menu_dest));
-	// Read resizing method
-	resizeMethod=gtk_combo_box_get_active(GTK_COMBO_BOX(menu_algo));
-	// Read round to neareast 16
-	CHECKBOX(checkbutton1,roundBool);
-}
-//---------------------------------------------
-// 	update dialog with new value
-//---------------------------------------------
-
-void write (void )
-{
- char str[100];
-
-        SPIN_SET(spinbutton_width,iw);
-        SPIN_SET(spinbutton_height,ih);
-
-	sprintf(str,"%2.2f",erx*100.);
-	gtk_label_set_text(GTK_LABEL(label_errorx),str);
-
-	sprintf(str,"%2.2f",ery*100.);
-	gtk_label_set_text(GTK_LABEL(label_errory),str);
-
-}
-
-//----------------------------
-GtkWidget*
-create_dialog1 (void)
-{
-  GtkWidget *dialog1;
-  GtkWidget *dialog_vbox1;
-  GtkWidget *vbox1;
-  GtkWidget *table1;
-  GtkWidget *table2;
-  GtkWidget *label1;
-  GtkWidget *label2;
-  GtkWidget *label3;
-  GtkWidget *label4;
-  GtkWidget *label5;
-  GtkWidget *label6;
-  GtkWidget *label7;
-  GtkAdjustment *spinbutton_width_adj;
-  GtkAdjustment *spinbutton_height_adj;
-  GtkWidget *dialog_action_area1;
-  GtkWidget *cancelbutton1;
-  GtkWidget *applybutton1;
-  GtkWidget *okbutton1;
-
-  dialog1 = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog1), QT_TR_NOOP("Resize"));
-  gtk_window_set_type_hint (GTK_WINDOW (dialog1), GDK_WINDOW_TYPE_HINT_DIALOG);
-  gtk_window_set_resizable (GTK_WINDOW (dialog1), FALSE);
-  gtk_container_set_border_width (GTK_CONTAINER (dialog1), 6);
-
-  dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (dialog1));
-  gtk_box_set_spacing (GTK_BOX (dialog_vbox1), 12);
-  gtk_widget_show (dialog_vbox1);
-
-  vbox1 = gtk_vbox_new (FALSE, 12);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox1), 6);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
-  gtk_widget_show (vbox1);
-
-  table1 = gtk_table_new (3, 4, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table1), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table1), 12);
-  gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, FALSE, 0);
-  gtk_widget_show (table1);
-
-  label1 = gtk_label_new_with_mnemonic (QT_TR_NOOP("_Width:"));
-  gtk_table_attach (GTK_TABLE (table1), label1, 0, 1, 0, 1,
-                    (GtkAttachOptions) (0),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);
-  gtk_widget_show (label1);
-   
-  spinbutton_width_adj = gtk_adjustment_new (2, 0, 3000, 1, 10, 10);
-  spinbutton_width = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_width_adj), 1, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label1), spinbutton_width);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton_width), TRUE);
-  gtk_table_attach (GTK_TABLE (table1), spinbutton_width, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND|GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_widget_show (spinbutton_width);
-
-  label2 = gtk_label_new_with_mnemonic (QT_TR_NOOP("_Height:"));
-  gtk_table_attach (GTK_TABLE (table1), label2, 2, 3, 0, 1,
-                    (GtkAttachOptions) (0),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
-  gtk_widget_show (label2);
-
-  spinbutton_height_adj = gtk_adjustment_new (1, 0, 3000, 1, 10, 10);
-  spinbutton_height = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_height_adj), 1, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label2), spinbutton_height);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton_height), TRUE);
-  gtk_table_attach (GTK_TABLE (table1), spinbutton_height, 3, 4, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND|GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_widget_show (spinbutton_height);
-
-  hscale1 = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (100, 0, 100, 1, 1, 0)));
-  gtk_scale_set_draw_value (GTK_SCALE (hscale1), FALSE);
-  gtk_table_attach (GTK_TABLE (table1), hscale1, 0, 4, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND|GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_widget_show (hscale1);
-
-  label3 = gtk_label_new (QT_TR_NOOP("Error X:"));
-  gtk_table_attach (GTK_TABLE (table1), label3, 0, 1, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5);
-  gtk_widget_show (label3);
-
-  label_errorx = gtk_label_new (QT_TR_NOOP("0"));
-  gtk_table_attach (GTK_TABLE (table1), label_errorx, 1, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label_errorx), 0, 0.5);
-  gtk_widget_show (label_errorx);
-  
-  label4 = gtk_label_new (QT_TR_NOOP("Error Y:"));
-  gtk_table_attach (GTK_TABLE (table1), label4, 2, 3, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
-  gtk_widget_show (label4);
-
-  label_errory = gtk_label_new (QT_TR_NOOP("0"));
-  gtk_table_attach (GTK_TABLE (table1), label_errory, 3, 4, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label_errory), 0, 0.5);
-  gtk_widget_show (label_errory);
-
-  table2 = gtk_table_new (4, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table2), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table2), 12);
-  gtk_box_pack_start (GTK_BOX (vbox1), table2, FALSE, FALSE, 0);
-  gtk_widget_show (table2);
-
-  checkbutton1 = gtk_check_button_new_with_mnemonic (QT_TR_NOOP("16 _round up"));
-  gtk_table_attach (GTK_TABLE (table2), checkbutton1, 0, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_widget_show (checkbutton1);
-  
-  label5 = gtk_label_new_with_mnemonic (QT_TR_NOOP("_Source:"));
-  gtk_table_attach (GTK_TABLE (table2), label5, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label5), 0, 0.5);
-  gtk_widget_show (label5);
-
-  menu_source = gtk_combo_box_text_new ();
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label5), menu_source);
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu_source), QT_TR_NOOP("1:1"));
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu_source), QT_TR_NOOP("4:3"));
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu_source), QT_TR_NOOP("16:9"));
-  gtk_table_attach (GTK_TABLE (table2), menu_source, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_widget_show (menu_source);
-
-  label6 = gtk_label_new_with_mnemonic (QT_TR_NOOP("_Destination:"));
-  gtk_table_attach (GTK_TABLE (table2), label6, 0, 1, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label6), 0, 0.5);
-  gtk_widget_show (label6);
-
-  menu_dest = gtk_combo_box_text_new ();
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label6), menu_dest);
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu_dest), QT_TR_NOOP("1:1"));
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu_dest), QT_TR_NOOP("4:3"));
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu_dest), QT_TR_NOOP("16:9"));
-  gtk_table_attach (GTK_TABLE (table2), menu_dest, 1, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_widget_show (menu_dest);
-
-  label7 = gtk_label_new_with_mnemonic (QT_TR_NOOP("_Method:"));
-  gtk_table_attach (GTK_TABLE (table2), label7, 0, 1, 3, 4,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label7), 0, 0.5);
-  gtk_widget_show (label7);
-
-  menu_algo = gtk_combo_box_text_new ();
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label7), menu_algo);
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu_algo), QT_TR_NOOP("Bilinear"));
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu_algo), QT_TR_NOOP("Bicubic"));
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu_algo), QT_TR_NOOP("Lanczos3"));
-  gtk_table_attach (GTK_TABLE (table2), menu_algo, 1, 2, 3, 4,
-                    (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_widget_show (menu_algo);
-
-  dialog_action_area1 = gtk_dialog_get_action_area (GTK_DIALOG (dialog1));
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-  gtk_widget_show (dialog_action_area1);
-
-  cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), cancelbutton1, GTK_RESPONSE_CANCEL);
-  gtk_widget_show (cancelbutton1);
-
-  applybutton1 = gtk_button_new_from_stock ("gtk-apply");
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), applybutton1, GTK_RESPONSE_APPLY);
-  gtk_widget_show (applybutton1);
-
-  okbutton1 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), okbutton1, GTK_RESPONSE_OK);
-  gtk_widget_show (okbutton1);
-
-  return dialog1;
-}

avidemux_2.6.15.tar.gz/foreignBuilds/msvc/include/dirent.h Deleted

@@ -1,55 +0,0 @@
-/*
- * DIRENT.H (formerly DIRLIB.H)
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-runtime package.
- * No warranty is given; refer to the file DISCLAIMER within the package.
- *
- */
-
-#ifndef _DIRENT_H_
-#define _DIRENT_H_
-
-#define _UNICODE
-
-#include <wchar.h>
-#include <tchar.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-struct _wdirent
-{
-	long		d_ino;		/* Always zero. */
-	unsigned short	d_reclen;	/* Always zero. */
-	unsigned short	d_namlen;	/* Length of name in d_name. */
-	wchar_t		d_name[260]; /* [FILENAME_MAX] */ /* File name. */
-};
-
-typedef struct
-{
-	struct _wfinddata_t	dd_dta;
-	struct _wdirent		dd_dir;
-	intptr_t		dd_handle;
-	int			dd_stat;
-	wchar_t			dd_name[1];
-} _WDIR;
-
-#define _tdirent	_wdirent
-#define _TDIR       _WDIR
-#define _topendir	_wopendir
-#define _tclosedir	_wclosedir
-#define _treaddir	_wreaddir
-#define _trewinddir	_wrewinddir
-
-_TDIR *_topendir (const _TCHAR *szPath);
-int _tclosedir (_TDIR * dirp);
-struct _tdirent *_treaddir (_TDIR * dirp);
-void _trewinddir (_TDIR * dirp);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

avidemux_2.6.15.tar.gz/License.txt -> avidemux_2.6.16.tar.gz/License.txt Changed

@@ -1,21 +1,5 @@
 Avidemux is GPL V2.
 It contains other software included as source with the following licenses :
-Name    : Secret Rabit Code
-URL     : http://www.mega-nerd.com/SRC
-License : GPL 
-
-Name   : BVecor
-URL    : http://berenger.eu/blog/
-License: LGPL
-
-Name    : ffmpeg
-URL     : http://www.ffmpeg.org
-License : GPL >=2
-
-Name   : fglrx_info
-URL    : Splitted-Desktop Systems
-License: GPLv2
-
 Name   : liba52
 URL    : http://liba52.sf.net
 License: GPL
@@ -24,13 +8,6 @@
 URL     : http://www.underbit.com/products/mad
 License : GPL
 
-Name   :  TwoLame
-URL    :  http://twolame.sf.net
-License:  LGPL
-
-URL    : http://mp4v2.googlecode.com/svn
-License: LGPL
-Rev: 485
 Name   : Spidermonky
 URL    : https://developer.mozilla.org/en/SpiderMonkey
 License: GPLv2
@@ -39,11 +16,38 @@
 URL: http://www.tinypy.org
 License : MIT + PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 
 
+Name   :  TwoLame
+URL    :  http://twolame.sf.net
+License:  LGPL
+
+URL    : http://mp4v2.googlecode.com/svn
+License: LGPL
+Rev: 485
 Name    : libass
-URL     : https://code.google.com/p/libass/
+URL     : https://github.com/libass/libass.git
 License : GPL >=2
-Version : 0.10.1
+Version : commit 23de9995103c16ceceba19cae87e328be12fa8e4 / 3 August , slightly more recent than 0.12.3
+
+Name    : Secret Rabit Code
+URL     : http://www.mega-nerd.com/SRC
+License : GPL 
 
 URL    : https://github.com/saintdev/libmkv.git
 License:  GPL
 Rev: 0.6.5.1 / d2906c03cc8f91fca0074e02bb14504a0e85bce6
+Name   : fglrx_info
+URL    : Splitted-Desktop Systems
+License: GPLv2
+
+Name    : ffmpeg
+URL     : http://www.ffmpeg.org
+License : GPL >=2
+
+Name    : libjson
+URL     : https://sourceforge.net/projects/libjson/
+License : GPL 
+
+Name   : BVecor
+URL    : http://berenger.eu/blog/
+License: LGPL
+

avidemux_2.6.15.tar.gz/avidemux/cli/ADM_UIs/src/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux/cli/ADM_UIs/src/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux/cli/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux/cli/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_audioFilter/src/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_audioFilter/src/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_dolby.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_dolby.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_dolby_table.h -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_dolby_table.h Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_commonUI/DIA_jobs_save.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_commonUI/DIA_jobs_save.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_commonUI/GUI_ui.h -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_commonUI/GUI_ui.h Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_render/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_render/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.h -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.h Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_slave.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_slave.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/common/A_functions.h -> avidemux_2.6.16.tar.gz/avidemux/common/A_functions.h Changed

avidemux_2.6.15.tar.gz/avidemux/common/GUI_jobs.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/GUI_jobs.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/common/gui_blackframes.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/gui_blackframes.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/common/gui_main.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/gui_main.cpp Changed

@@ -993,6 +993,12 @@
  */
 bool A_runPythonScript(const std::string &name)
 {
+  if(!getPythonScriptEngine())
+  {
+   GUI_Info_HIG(ADM_LOG_IMPORTANT,"Qt",QT_TRANSLATE_NOOP("adm","The tinypy plugin is missing.\nExpect problems."));
+   return false;
+  }
+
   return parseScript(getPythonScriptEngine(),name.c_str(),IScriptEngine::Normal);
 }
 bool A_parseScript(IScriptEngine *engine, const char *name)
@@ -1030,8 +1036,12 @@
 void A_saveDefaultSettings()
 {
     IScriptEngine *engine=getPythonScriptEngine();
-    ADM_assert(engine);
-    
+    if(!engine)
+    {
+      GUI_Info_HIG(ADM_LOG_IMPORTANT,"Qt",QT_TRANSLATE_NOOP("adm","The tinypy plugin is missing.\nExpect problems."));
+      return;
+    }
+ 
     std::string fileName=DEFAULT_SETTINGS_FILE;
     
     IScriptWriter *writer = engine->createScriptWriter();
@@ -1578,12 +1588,14 @@
         {
                 return RENDER_GTK;
         }
+#if 0
         if(strcmp(displ,":0") && strcmp(displ,":0.0"))
         {
                 printf("Looks like remote display, no Xv :%s\n",displ);
                 return RENDER_GTK;
         }
 #endif
+#endif
 
         if(prefs->get(VIDEODEVICE,&renderI)!=RC_OK)
         {

avidemux_2.6.15.tar.gz/avidemux/common/gui_navigate.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/gui_navigate.cpp Changed

@@ -40,9 +40,10 @@
 extern uint8_t DIA_gotoTime(uint32_t *hh, uint32_t *mm, uint32_t *ss,uint32_t *ms);
 bool   GUI_GoToTime(uint64_t time);
 bool   GUI_infiniteForward(uint64_t pts);
+bool   GUI_lastFrameBeforePts(uint64_t pts);
 bool   GUI_SeekByTime(int64_t time);
 static void A_timedError(const char *s);
-uint8_t A_jumpToTime(uint32_t hh,uint32_t mm,uint32_t ss,uint32_t ms);
+bool A_jumpToTime(uint32_t hh,uint32_t mm,uint32_t ss,uint32_t ms);
 /**
     \fn HandleAction_Navigate
 
@@ -443,38 +444,53 @@
     \fn A_jumpToTime
     \brief Jump to a given time
 */
-uint8_t A_jumpToTime(uint32_t hh,uint32_t mm,uint32_t ss,uint32_t ms)
+bool A_jumpToTime(uint32_t hh,uint32_t mm,uint32_t ss,uint32_t ms)
 {
-uint64_t pts;
-        pts=hh*3600+mm*60+ss;
-        pts*=1000;
-        pts+=ms;
-        pts*=1000;
-        // Try to find a frame just before pts...
-//#warning Fixme, be more accurate
-        if(false==video_body->getPKFramePTS(&pts)) return false;
-
-        //
-        return GUI_GoToTime(pts);
-
+    uint64_t pts;
+    pts=hh*3600+mm*60+ss;
+    pts*=1000;
+    pts+=ms;
+    pts*=1000;
+    if(pts > video_body->getVideoDuration())
+    {
+        ADM_warning("Cannot navigate beyond the end of the video\n");
+        return false;
+    }
+    uint64_t lastpts=pts;
+    if(false==video_body->getNKFramePTS(&lastpts)) // at the end of the video, be careful
+    {
+        if(false==video_body->getPKFramePTS(&lastpts))
+            return false;
+        GUI_infiniteForward(lastpts);
+        lastpts=admPreview::getCurrentPts();
+        if(pts>=lastpts) // if at or beyond the last frame but within the total duration
+            return GUI_GoToTime(lastpts); // go to the last frame
+    }
+    if(false==GUI_lastFrameBeforePts(pts)) // we are probably at the beginning of the video,
+        video_body->rewind(); // go to the first frame then
+    admPreview::samePicture();
+    GUI_setCurrentFrameAndTime();
+    return true;
 }
 /**
     \fn GUI_SeekByTime
 */
 bool GUI_SeekByTime(int64_t time)
 {
-   uint64_t pts=admPreview::getCurrentPts(); 
-
-   if (time < 0 && pts < -time) 
-         pts = 0; 
-   else
-         pts += time;
-
-   ADM_info("Seek to:%s ms \n",ADM_us2plain(pts));  
-   if(video_body->getPKFramePTS(&pts))
-       return GUI_GoToTime(pts);
-
-   return false;
+    uint64_t pts=admPreview::getCurrentPts();
+
+    if (time < 0 && pts < -time)
+    {   // we can't assume that pts=0 were legitimate, rewind to the first frame instead
+        video_body->rewind();
+        admPreview::samePicture();
+        GUI_setCurrentFrameAndTime();
+        return true;
+    }else
+    {
+        pts += time;
+    }
+    ADM_info("Seek to:%s ms \n",ADM_us2plain(pts));
+    return GUI_lastFrameBeforePts(pts);
 }
 
 /**
@@ -509,6 +525,32 @@
 }
 
 /**
+    \fn GUI_lastFrameBeforePts
+ */
+bool GUI_lastFrameBeforePts(uint64_t pts)
+{
+    uint64_t pts2=pts;
+    // Try to find a keyframe just before pts
+    if(video_body->getPKFramePTS(&pts2))
+    { // Starting from there, approach the last frame before pts
+        admPreview::deferDisplay(1);
+        GUI_GoToTime(pts2);
+        uint64_t tmp;
+        while(pts2<pts)
+        {
+            tmp=pts2;
+            admPreview::nextPicture();
+            tmp=admPreview::getCurrentPts();
+            if(tmp>pts) break; // otherwise we may overshoot
+            pts2=tmp;
+        }
+        admPreview::deferDisplay(0);
+        return GUI_GoToTime(pts2);
+    }
+    return false;
+}
+
+/**
  * \fn A_timedError
  * \brief display error unless the last error is too recent
  * @param s

avidemux_2.6.15.tar.gz/avidemux/common/gui_play.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/gui_play.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/common/main.cpp -> avidemux_2.6.16.tar.gz/avidemux/common/main.cpp Changed

@@ -12,7 +12,6 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include "ADM_cpp.h"
 #include "config.h"
 #include "ADM_default.h"
 #include "ADM_threads.h"
@@ -37,6 +36,14 @@
 
 void abortExitHandler(void);
 
+typedef struct flavors
+{
+        const char *qt4;
+        const char *qt5;
+};
+
+static flavors myFlavors={"qt4","qt5"};
+
 #ifdef main
 extern "C"
 {
@@ -48,7 +55,7 @@
 {
 	ADM_initBaseDir(_argc, _argv);
 
-#if defined(_WIN32) && (ADM_UI_TYPE_BUILD == ADM_UI_GTK || ADM_UI_TYPE_BUILD == ADM_UI_QT4)
+#if defined(_WIN32) && (ADM_UI_TYPE_BUILD == ADM_UI_GTK || ADM_UI_TYPE_BUILD == ADM_UI_QT4) 
 	// redirect output before registering exception handler so error dumps are captured
 	redirectStdoutToFile();
 #endif
@@ -90,7 +97,7 @@
     {
         case ADM_UI_QT4:
 #if ADM_UI_TYPE_BUILD == ADM_UI_QT4
-            return QT_FLAVOR;
+                return myFlavors.QT_FLAVOR;
 #else
             return "qt4";
 #endif
@@ -170,11 +177,11 @@
 int startAvidemux(int argc, char *argv[])
 {
 
+#define MKSTRING(x) #x
     printf("*************************\n");
-    printf("  Avidemux v%s", ADM_VERSION);
+    printf("  Avidemux v%s", MKSTRING(ADM_VERSION));
 
 #if defined( ADM_SUBVERSION )
-#define MKSTRING(x) x
          printf(" (%s) .", MKSTRING(ADM_SUBVERSION));
 #endif
 
@@ -288,7 +295,11 @@
 #endif
 
 #if defined( USE_DXVA2)
-    extern bool admDxva2_exitCleanup();
+    extern bool
+#ifdef _MSC_VER
+     __declspec(dllimport)
+#endif
+	admDxva2_exitCleanup();
     PROBE_HW_ACCEL(dxva2Probe,DXVA2,initDXVA2Decoder,admDxva2_exitCleanup)
 #endif

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h Changed

@@ -14,53 +14,199 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef ADM_FLY_DIALOG_QT4H
-#define ADM_FLY_DIALOG_QT4H
+#pragma once
+
 
 #include "ADM_UIQT46_export.h"
 #include "ADM_image.h"
-#include "DIA_flyDialog.h"
 
-class FlyDialogEventFilter : public QObject
+#include "ADM_coreVideoFilter6_export.h"
+
+
+#include <QWidget>
+#include <QDialog>
+#include <QSlider>
+#include <QFrame>
+#include <QTimer>
+#include <QDialog>
+
+#include "ADM_default.h"
+#include "ADM_rgb.h"
+#include "ADM_colorspace.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_imageResizer.h"
+#define ADM_FLY_SLIDER_MAX 1000
+
+enum ResizeMethod 
 {
-	ADM_flyDialog *flyDialog;
-	bool recomputed;
+    RESIZE_NONE = 0,    // No automatic resize
+    RESIZE_AUTO = 1,    // Resize image when convenient (YUV: after filter, RGB: before applying filter)
+    RESIZE_LAST = 2        // Resize image after filter has been applied (slower for RGB)
+};
 
-public:
-	FlyDialogEventFilter(ADM_flyDialog *flyDialog);
+class ADM_flyDialog;
+
+class QHBoxLayout;
+class QPushButton;
+class QRadioButton;
 
+
+class ADM_UIQT46_EXPORT ADM_QCanvas : public QWidget
+{
 protected:
-	bool eventFilter(QObject *obj, QEvent *event);
+	uint32_t _w,_h;
+public:
+	uint8_t *dataBuffer;
+
+	ADM_QCanvas(QWidget *z, uint32_t w, uint32_t h);
+	~ADM_QCanvas();
+	void paintEvent(QPaintEvent *ev);
+	void changeSize(uint32_t w, uint32_t h);
 };
 
-class ADM_UIQT46_EXPORT ADM_flyDialogQt4 : public ADM_flyDialog
+
+
+/**
+    \class ADM_flyDialog
+    \brief Base class for flyDialog
+*/
+class ADM_UIQT46_EXPORT ADM_flyDialog : public QObject
 {
+  Q_OBJECT
+ protected:     
+         QTimer             timer;
+          uint32_t      _w, _h, _zoomW, _zoomH;
+          float         _zoom;
+          uint32_t      _zoomChangeCount;
+          ResizeMethod  _resizeMethod;
+          uint64_t      lastPts;
+          double        _computedZoom;
+          
+          
+          ADM_coreVideoFilter *_in;
+      
+          ADMImage      *_yuvBuffer;
+          ADM_byteBuffer _rgbByteBufferDisplay;
+          
+          QPushButton *pushButton_back1mn;
+          QPushButton *pushButton_play;
+          QPushButton *pushButton_next;
+          QPushButton *pushButton_fwd1mn;
+          QRadioButton *radioButton_autoZoom;
+          QDialog     *_parent;
+
+          
+          
+  public:
+          void          *_cookie; // whatever, usually the ui_xxx component
+          QSlider       *_slider; // widget
+          ADM_QCanvas   *_canvas; // Drawing zone
+          
+  public:
+                            ADM_flyDialog(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
+                                 ADM_QCanvas *canvas, QSlider *slider, ResizeMethod resizeMethod);
+          virtual           ~ADM_flyDialog(void);    
+          void               recomputeSize(void);
+          virtual bool       disableZoom(void);
+          virtual bool       enableZoom(void);          
+          virtual bool       sameImage(void);
+                  uint64_t   getCurrentPts();
+          ADM_coreVideoFilter *getUnderlyingFilter() {return _in;}
+                  bool        addControl(QHBoxLayout *layout);
+protected:
+  virtual ADM_colorspace     toRgbColor(void);
+          void               updateZoom(void);
+          void               EndConstructor(void);
+          uint8_t            cleanup(void);          
+  /* Filter dependant : you have to implement them*/
+//
+           virtual           void resetScaler(void)=0; // dont bother, implemented by yuv or rgb subclass
+           virtual           bool process(void)=0; // dont bother, implemented by yuv or rgb subclass
 public:
-  ADM_flyDialogQt4(uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
-                              void *canvas, void *slider, int yuv, ResizeMethod resizeMethod);
+  
+  virtual uint8_t    download(void)=0;
+  virtual uint8_t    upload(void)=0;
+  //virtual uint8_t  update(void)=0;
+
+  virtual bool       setCurrentPts(uint64_t pts) {return true;};
 
+
+         
+// UI dependant part : They are implemented in ADM_flyDialogGtk/Qt/...
+public:  
   
   virtual bool     isRgbInverted(void);
   virtual uint8_t  display(uint8_t *rgbData);
-  virtual float    calcZoomFactor(void);
-  virtual uint32_t sliderGet(void);
-  virtual uint8_t  sliderSet(uint32_t value);
+  virtual float    calcZoomFactor(void);  
+  virtual uint32_t sliderGet(void);             // Return the slider value between 0 and ADM_FLY_SLIDER_MAX
+  virtual uint8_t  sliderSet(uint32_t value);  // Set slider value between 0 and ADM_FLY_SLIDE_MAX
   virtual void     postInit(uint8_t reInit);
-    bool           setCurrentPts(uint64_t pts) {return 1;}
+public:  
+  virtual uint8_t  sliderChanged(void);
+  virtual bool     goToTime(uint64_t tme);
+  
+public slots:
+        virtual bool nextImage(void);
+        virtual void backOneMinute(void);
+        virtual void fwdOneMinute(void);
+        virtual void autoZoom(bool status);
+        virtual void play(bool status);
+        virtual void timeout();  
+};
+/**
+ * \class ADM_flyDialogYuv
+ */
+class ADM_UIQT46_EXPORT ADM_flyDialogYuv: public  ADM_flyDialog
+{
+  Q_OBJECT
+public:
+                    ADMImage              *_yuvBufferOut;
+                    ADMColorScalerFull    *yuvToRgb;  
+public:
+          virtual    bool process(void);
+          virtual    void resetScaler(void);
+          
+                                ADM_flyDialogYuv(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
+                                ADM_QCanvas *canvas, QSlider *slider, 
+                                ResizeMethod resizeMethod);
+            virtual             ~ADM_flyDialogYuv();
+            virtual uint8_t    processYuv(ADMImage* in, ADMImage *out) =0;
+ 
 };
 
+/**
+ * \class ADM_flyDialogYuv
+ */
+class ADM_UIQT46_EXPORT ADM_flyDialogRgb: public  ADM_flyDialog
+{
+  Q_OBJECT
+public:
+                    ADM_byteBuffer     _rgbByteBuffer;
+                    ADM_byteBuffer     _rgbByteBufferOut;
+                    ADMColorScalerFull *yuv2rgb;
+                    ADMColorScalerFull *rgb2rgb;
+public:
+          virtual    bool process(void);
+          virtual    void resetScaler(void);
+          
+                            ADM_flyDialogRgb(QDialog *parent,uint32_t width, uint32_t height, 
+                                 ADM_coreVideoFilter *in,  ADM_QCanvas *canvas,  QSlider *slider, ResizeMethod resizeMethod);
+           virtual          ~ADM_flyDialogRgb();
+           virtual uint8_t  processRgb(uint8_t *in, uint8_t *out) =0;
+};
 
-class ADM_UIQT46_EXPORT ADM_QCanvas : public QWidget
+/**
+ * \fn ADM_flyDialogYuv
+ */
+class ADM_UIQT46_EXPORT FlyDialogEventFilter : public QObject
 {
-protected:
-	uint32_t _w,_h;
+	ADM_flyDialog *flyDialog;
+	bool recomputed;
+
 public:
-	uint8_t *dataBuffer;
+	FlyDialogEventFilter(ADM_flyDialog *flyDialog);
 
-	ADM_QCanvas(QWidget *z, uint32_t w, uint32_t h);
-	~ADM_QCanvas();
-	void paintEvent(QPaintEvent *ev);
-	void changeSize(uint32_t w, uint32_t h);
+protected:
+	bool eventFilter(QObject *obj, QEvent *event);
 };
 
-#endif

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_UIs/src/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_UIs/src/CMakeLists.txt Changed

avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp Added

@@ -0,0 +1,606 @@
+/***************************************************************************
+    copyright            : (C) 2006 by mean
+    email                : fixounet@free.fr
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************///
+
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#define ADM_FLY_INTERNAL
+#include "DIA_flyDialogQt4.h"
+#include "ADM_assert.h"
+#include <QtCore/QEvent>
+#include <QtCore/QCoreApplication>
+#include <QGraphicsView>
+#include <QSlider>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QHBoxLayout>
+#include <QApplication>
+#include "ADM_toolkitQt.h"
+extern "C" {
+#include "libavcodec/avcodec.h"
+}
+
+/**
+    \fn updateZoom
+*/
+void ADM_flyDialog::updateZoom(void)
+{   
+        _rgbByteBufferDisplay.clean();
+        _rgbByteBufferDisplay.setSize(_zoomW * _zoomH * 4);
+        resetScaler();
+}
+/**
+ * 
+ * @return 
+ */
+bool ADM_flyDialog::disableZoom()
+{
+    _resizeMethod = RESIZE_NONE;
+    recomputeSize();
+    return true;
+}
+bool       ADM_flyDialog::enableZoom(void)
+{
+      _resizeMethod = RESIZE_AUTO;
+    recomputeSize();
+    return true;
+}
+/**
+    \fn    recomputeSize
+    \brief recompute zoom factor
+*/
+
+void ADM_flyDialog::recomputeSize(void)
+{
+    if(this->_resizeMethod==RESIZE_NONE)
+    {
+        _zoom = 1;
+        _zoomW = _w;
+        _zoomH = _h;
+        updateZoom();
+        postInit (true);
+        sliderChanged();
+        return;
+    }
+    
+    float new_zoom = calcZoomFactor();
+
+    ResizeMethod new_resizeMethod;
+    uint32_t new_zoomW;
+    uint32_t new_zoomH;
+
+    new_zoomW = uint32_t (_w * new_zoom);
+    new_zoomH = uint32_t (_h * new_zoom);
+    
+    if ( new_zoom == _zoom && new_zoomW == _zoomW && new_zoomH == _zoomH)
+        return;
+
+    if ( new_zoomH < 30 || new_zoomW < 30)
+    {
+        ADM_info ("Resisting zoom size change from %dx%d (zoom %.5f) to %dx%d (zoom %.5f)\n",
+                _zoomW, _zoomH, _zoom, new_zoomW, new_zoomH, new_zoom);
+        return;
+    }
+
+    ADM_info ("Fixing zoom size from %dx%d (zoom %.5f) to correct %dx%d (zoom %.5f)\n",
+            _zoomW, _zoomH, _zoom, new_zoomW, new_zoomH, new_zoom);
+    _zoom = new_zoom;
+    _zoomW = new_zoomW;
+    _zoomH = new_zoomH;
+    updateZoom();
+    postInit (true);
+    sliderChanged();
+}
+
+/**
+    \fn cleanup
+    \brief deallocate
+*/
+uint8_t ADM_flyDialog::cleanup(void)
+{
+#define DEL1(x)    if(x) {delete [] x;x=NULL;}
+#define DEL2(x)    if(x) {delete  x;x=NULL;}
+	DEL2(_yuvBuffer);
+	_rgbByteBufferDisplay.clean();
+	return 1;
+}
+/**
+    \fn ~ADM_flyDialog
+    \brief destructor
+*/
+ADM_flyDialog::~ADM_flyDialog(void)
+{
+  cleanup(); 
+}
+
+/**
+      \fn sliderChanged
+      \brief callback to handle image changes
+*/
+bool    ADM_flyDialog::goToTime(uint64_t tme)
+{
+     _in->goToTime(tme);
+     return nextImage();
+}
+uint8_t    ADM_flyDialog::sliderChanged(void)
+{
+  uint32_t fn= sliderGet();
+  uint32_t frameNumber;
+  uint32_t len,flags;
+  
+    ADM_assert(_yuvBuffer);
+    ADM_assert(_in);
+
+
+    double time;
+    time=fn;
+    time/=ADM_FLY_SLIDER_MAX;
+    time*=_in->getInfo()->totalDuration;
+    return goToTime(time);
+    
+}
+/**
+    \fn toRgbColor
+*/
+ADM_colorspace ADM_flyDialog::toRgbColor(void)
+{
+    if(isRgbInverted()) return ADM_COLOR_BGR32A;
+    return ADM_COLOR_RGB32A;
+}
+/**
+ * 
+ * @param frame
+ * @return 
+ */
+bool        ADM_flyDialog::addControl(QHBoxLayout *horizontalLayout_4)
+{
+        _parent->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
+        pushButton_back1mn = new QPushButton();
+        pushButton_back1mn->setObjectName(QString("pushButton_back1mn"));
+        pushButton_back1mn->setAutoRepeat(true);
+        pushButton_back1mn->setAutoRepeatDelay(1000);
+
+        horizontalLayout_4->addWidget(pushButton_back1mn);
+
+        pushButton_play = new QPushButton();
+        pushButton_play->setObjectName(QString("pushButton_play"));
+        pushButton_play->setCheckable(true);
+
+        horizontalLayout_4->addWidget(pushButton_play);
+
+        pushButton_next = new QPushButton();
+        pushButton_next->setObjectName(QString("pushButton_next"));
+        pushButton_next->setAutoRepeat(true);
+        pushButton_next->setAutoRepeatDelay(1000);
+
+        horizontalLayout_4->addWidget(pushButton_next);
+
+        pushButton_fwd1mn = new QPushButton();
+        pushButton_fwd1mn->setObjectName(QString("pushButton_fwd1mn"));
+        pushButton_fwd1mn->setAutoRepeat(true);
+        pushButton_fwd1mn->setAutoRepeatDelay(1000);
+
+        horizontalLayout_4->addWidget(pushButton_fwd1mn);
+        
+        radioButton_autoZoom = new QRadioButton();
+        radioButton_autoZoom->setObjectName(QString("radioButton_autoZoom"));
+        radioButton_autoZoom->setChecked(true);
+
+        horizontalLayout_4->addWidget(radioButton_autoZoom);
+
+        
+        QSpacerItem  *horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+        horizontalLayout_4->addItem(horizontalSpacer_4);
+        
+        pushButton_back1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Back one minute", 0));
+        pushButton_back1mn->setText(QApplication::translate("seekablePreviewDialog", "<<", 0));
+        pushButton_play->setText(QApplication::translate("seekablePreviewDialog", "Play", 0));
+        pushButton_next->setStatusTip(QApplication::translate("seekablePreviewDialog", "next image", 0));
+        pushButton_next->setText(QApplication::translate("seekablePreviewDialog", ">", 0));
+        pushButton_fwd1mn->setText(QApplication::translate("seekablePreviewDialog", ">>", 0));
+        radioButton_autoZoom->setText(QApplication::translate("seekablePreviewDialog", "A&utoZoom", 0));
+        
+        QObject::connect(pushButton_next ,SIGNAL(clicked()),this,SLOT(nextImage()));
+        QObject::connect(pushButton_back1mn ,SIGNAL(clicked()),this,SLOT(backOneMinute()));
+        QObject::connect(pushButton_fwd1mn ,SIGNAL(clicked()),this,SLOT(fwdOneMinute()));
+        QObject::connect(pushButton_play ,SIGNAL(toggled(bool )),this,SLOT(play(bool)));
+        QObject::connect(radioButton_autoZoom ,SIGNAL(toggled(bool )),this,SLOT(autoZoom(bool)));
+      
+        return true;
+}
+
+/**
+    \fn sameImage
+*/
+bool ADM_flyDialog::sameImage(void)
+{
+    process();
+    return display(_rgbByteBufferDisplay.at(0));
+}
+uint64_t ADM_flyDialog::getCurrentPts()
+{
+    return lastPts;
+}
+/**
+    \fn nextImage
+*/
+bool ADM_flyDialog::nextImage(void)
+{
+    uint32_t frameNumber;
+    if(!_in->getNextFrame(&frameNumber,_yuvBuffer))
+    {
+      ADM_warning("[FlyDialog] Cannot get frame %u\n",frameNumber); 
+      return 0;
+    }
+    lastPts=_yuvBuffer->Pts;
+    setCurrentPts(lastPts);
+    // Process...   
+    process();
+    return display(_rgbByteBufferDisplay.at(0));
+}
+//************************************
+// Implement the specific part
+// i.e. yuv processing or RGB processing
+//************************************
+  ADM_flyDialogYuv::ADM_flyDialogYuv(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
+                                ADM_QCanvas *canvas, QSlider *slider, 
+                                ResizeMethod resizeMethod) : ADM_flyDialog(parent,width,height,in,canvas,slider,resizeMethod)
+{
+        _yuvBufferOut=new ADMImageDefault(_w,_h);
+        yuvToRgb=NULL;  
+        updateZoom();
+        postInit(false);
+}
+void ADM_flyDialogYuv::resetScaler(void)
+{
+    if(yuvToRgb) delete yuvToRgb;
+    yuvToRgb=NULL;
+    yuvToRgb=new ADMColorScalerFull(ADM_CS_BICUBIC, 
+                            _w,
+                            _h,
+                            _zoomW,
+                            _zoomH,
+                            ADM_COLOR_YV12,toRgbColor());
+}
+ADM_flyDialogYuv::~ADM_flyDialogYuv()
+{
+    if(_yuvBufferOut) delete _yuvBufferOut;
+    _yuvBufferOut=NULL;
+}
+bool ADM_flyDialogYuv::process(void)
+{
+         processYuv(_yuvBuffer,_yuvBufferOut);
+        yuvToRgb->convertImage(_yuvBufferOut,_rgbByteBufferDisplay.at(0));
+        return true;
+}
+//*****************************************
+ADM_flyDialogRgb::ADM_flyDialogRgb(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
+                                ADM_QCanvas *canvas, QSlider *slider, 
+                                ResizeMethod resizeMethod) : ADM_flyDialog(parent,width,height,in,canvas,slider,resizeMethod)
+{
+    uint32_t size=_w*_h*4;
+    _rgbByteBuffer.setSize(size);
+    _rgbByteBufferOut.setSize(size);
+     yuv2rgb =new ADMColorScalerSimple(_w,_h,ADM_COLOR_YV12,
+                toRgbColor());
+    rgb2rgb=NULL;
+    updateZoom();
+    postInit(false);
+
+}
+void ADM_flyDialogRgb::resetScaler(void)
+{
+    if(rgb2rgb) delete rgb2rgb;
+    rgb2rgb=new ADMColorScalerFull(ADM_CS_BICUBIC, 
+                            _w,
+                            _h,
+                            _zoomW,
+                            _zoomH,
+                            ADM_COLOR_RGB32A,ADM_COLOR_RGB32A);
+}
+/**
+ * 
+ */
+ADM_flyDialogRgb::~ADM_flyDialogRgb()
+{
+    _rgbByteBuffer.clean();
+    _rgbByteBufferOut.clean();
+    if(rgb2rgb) delete rgb2rgb;
+    if(yuv2rgb) delete yuv2rgb;
+    rgb2rgb=NULL;
+    yuv2rgb=NULL;
+    
+}
+bool ADM_flyDialogRgb::process(void)
+{
+    yuv2rgb->convertImage(_yuvBuffer,_rgbByteBuffer.at(0));
+    if (_resizeMethod != RESIZE_NONE)
+    {
+        processRgb(_rgbByteBuffer.at(0),_rgbByteBufferOut.at(0));
+        rgb2rgb->convert(_rgbByteBufferOut.at(0), _rgbByteBufferDisplay.at(0));
+    }else
+    {
+        processRgb(_rgbByteBuffer.at(0),_rgbByteBufferDisplay.at(0));
+    }
+    return true;
+}
+
+extern float UI_calcZoomToFitScreen(QWidget* window, QWidget* canvas, uint32_t imageWidth, uint32_t imageHeight);
+
+/**
+    \fn    FlyDialogEventFilter
+    \brief
+*/
+
+FlyDialogEventFilter::FlyDialogEventFilter(ADM_flyDialog *flyDialog)
+{
+	recomputed = false;
+	this->flyDialog = flyDialog;
+}
+/**
+    \fn    eventFilter
+    \brief
+*/
+
+bool FlyDialogEventFilter::eventFilter(QObject *obj, QEvent *event)
+{
+	if (event->type() == QEvent::Show && !recomputed)
+	{
+		recomputed = true;
+		QWidget* parent = (QWidget*)obj;
+		uint32_t screenWidth, screenHeight;
+
+		UI_getPhysicalScreenSize(parent, &screenWidth, &screenHeight);
+		flyDialog->recomputeSize();
+		QCoreApplication::processEvents();
+		parent->move((((int)screenWidth) - parent->frameSize().width()) / 2, (((int)screenHeight) - parent->frameSize().height()) / 2);
+	}
+
+	return QObject::eventFilter(obj, event);
+}
+/**
+    \fn    ADM_flyDialog
+    \brief
+*/
+
+  ADM_flyDialog::ADM_flyDialog(QDialog *parent ,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
+                              ADM_QCanvas *canvas, QSlider *slider,  ResizeMethod resizeMethod)
+{  
+    ADM_assert(canvas);
+
+    if (slider)
+            ADM_assert(in);
+    _parent=parent;
+    _w = width;
+    _h = height;    
+    _in = in;
+    _slider = slider;
+    _canvas = canvas;
+    _cookie = NULL;
+    _computedZoom=0;
+    _resizeMethod = resizeMethod;
+    _zoomChangeCount = 0;        
+    _yuvBuffer=new ADMImageDefault(_w,_h);
+    lastPts=0;
+    if (_resizeMethod != RESIZE_NONE) 
+    {
+        _zoom = calcZoomFactor();
+        if (_zoom == 1) 
+        {
+            _resizeMethod = RESIZE_NONE;
+        }
+    }
+    if (_resizeMethod == RESIZE_NONE) 
+    {
+        _zoom = 1;
+        _zoomW = _w;
+        _zoomH = _h;
+    } else 
+    {
+        _zoomW = uint32_t(_w * _zoom);
+        _zoomH = uint32_t(_h * _zoom);
+    }
+    
+    connect(&timer,SIGNAL(timeout()),this,SLOT(timeout()));
+    timer.setSingleShot(true);
+
+    int incrementUs=getUnderlyingFilter()->getInfo()->frameIncrement;
+
+    incrementUs=(incrementUs+501)/1000; // us => ms
+    if(incrementUs<10) incrementUs=10;
+
+    timer.setInterval(incrementUs);
+    timer.stop();
+    
+}
+/**
+    \fn    postInit
+    \brief
+*/
+
+void ADM_flyDialog::postInit(uint8_t reInit)
+{
+	QWidget *graphicsView = ((ADM_QCanvas*)_canvas)->parentWidget();
+	QSlider  *slider=(QSlider *)_slider;
+
+	if (reInit)
+	{
+		FlyDialogEventFilter *eventFilter = new FlyDialogEventFilter(this);
+
+		if (slider)
+			slider->setMaximum(ADM_FLY_SLIDER_MAX);
+
+		graphicsView->parentWidget()->installEventFilter(eventFilter);
+	}
+
+	((ADM_QCanvas*)_canvas)->changeSize(_zoomW, _zoomH);
+	graphicsView->setMinimumSize(_zoomW, _zoomH);
+	graphicsView->resize(_zoomW, _zoomH);
+}
+/**
+    \fn    calcZoomFactor
+    \brief
+*/
+
+float ADM_flyDialog::calcZoomFactor(void)
+{
+    if(_computedZoom) return _computedZoom;
+    double zoom;
+    zoom=UI_calcZoomToFitScreen(((ADM_QCanvas*)_canvas)->parentWidget()->parentWidget(), ((ADM_QCanvas*)_canvas)->parentWidget(), _w, _h);
+    // Find the closest integer
+    // zoom it ?
+    if((zoom+0.3)>1)
+    {
+        _computedZoom=floor(2*(zoom+0.3))/2;
+        ADM_info("AutoZoom %f ->%f \n",(float)zoom,(float)_computedZoom);
+        return _computedZoom;
+    }
+    double invertZoom=1/zoom;
+    _computedZoom=2./floor((2*(invertZoom+0.3)));
+    ADM_info("AutoZoom 1/%f\n",(float)(1./_computedZoom));
+    return _computedZoom;
+    
+}
+/**
+    \fn    display
+    \brief
+*/
+
+uint8_t  ADM_flyDialog::display(uint8_t *rgbData)
+{
+   ADM_QCanvas *view=(ADM_QCanvas *)_canvas;
+   ADM_assert(view);
+   view->dataBuffer=rgbData;
+   if(!rgbData)
+   {
+      ADM_info("flyDialog: No rgbuffer ??\n"); 
+   } 
+   view->repaint();
+  return 1; 
+}
+/**
+    \fn    sliderGet
+    \brief
+*/
+
+uint32_t ADM_flyDialog::sliderGet(void)
+{
+  QSlider  *slide=(QSlider *)_slider;
+  ADM_assert(slide);
+  return slide->value();
+  
+}
+/**
+    \fn    sliderSet
+    \brief
+*/
+
+uint8_t     ADM_flyDialog::sliderSet(uint32_t value)
+{
+  QSlider  *slide=(QSlider *)_slider;
+  ADM_assert(slide);
+  if(value>ADM_FLY_SLIDER_MAX) value=ADM_FLY_SLIDER_MAX;
+  slide->setValue(value);
+  return 1; 
+}
+/**
+    \fn    isRgbInverted
+    \brief
+*/
+bool  ADM_flyDialog::isRgbInverted(void)
+{
+  return 0; 
+}
+
+
+/**
+ * 
+ */
+#define JUMP_LENGTH (60LL*1000LL*1000LL)
+
+void ADM_flyDialog::backOneMinute(void)
+{
+    uint64_t pts=getCurrentPts();
+    if(pts<JUMP_LENGTH) pts=0;
+    else pts-=JUMP_LENGTH;
+    goToTime(pts);
+}
+/**
+ * 
+ */
+void ADM_flyDialog::fwdOneMinute(void)
+{
+    uint64_t pts=getCurrentPts();
+    pts+=JUMP_LENGTH;
+    goToTime(pts);
+
+}
+/**
+ * 
+ */
+void ADM_flyDialog::play(bool state)
+{
+    if(state)
+    {
+       pushButton_back1mn->setEnabled(false);
+       pushButton_fwd1mn->setEnabled(false);
+       pushButton_next->setEnabled(false);
+       timer.start();
+    }else
+    {
+        timer.stop();
+        pushButton_back1mn->setEnabled(true);
+        pushButton_fwd1mn->setEnabled(true);
+        pushButton_next->setEnabled(true);
+    }
+    
+}
+
+/**
+ * 
+ */
+void ADM_flyDialog::autoZoom(bool state)
+{
+    ADM_info("*** AUTO ZOOM = %d\n",(int)state);
+    if(!state)
+    {
+        disableZoom();
+        _canvas->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
+        _parent->adjustSize();
+        
+    }else
+    {
+        enableZoom();
+        _parent->adjustSize();
+    }
+
+}
+
+void ADM_flyDialog::timeout()
+{
+    
+    bool r=nextImage();
+    if(r)
+    {
+        timer.start();
+    }
+    else
+    {
+       pushButton_play->setChecked(false);
+    }
+}
+
+
+//******************************
+//EOF
+

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_UIs/src/toolkit.cpp -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_UIs/src/toolkit.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_jobs/src/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_jobs/src/CMakeLists.txt Changed

avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_openGL/include/ADM_openGL_export.h Added

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_openGL/include/ADM_openGl.h -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_openGL/include/ADM_openGl.h Changed

@@ -14,13 +14,15 @@
  ***************************************************************************/
 #pragma once
 #define GL_GLEXT_PROTOTYPES
+#include "ADM_openGL_export.h"
+
 #ifdef __APPLE__
 #	include <OpenGL/gl.h>
 #   include <OpenGL/glu.h>
 #	include <OpenGL/glext.h>
-
 #	define GL_TEXTURE_RECTANGLE_NV GL_TEXTURE_RECTANGLE_EXT
 
+
 typedef void (* PFNGLACTIVETEXTUREPROC) (GLenum texture);
 typedef void (* PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
 typedef void (* PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
@@ -42,7 +44,7 @@
 /**
     \class ADM_glExt
 */
-class ADM_glExt
+class ADM_OPENGL6_EXPORT ADM_glExt
 {
 public:
  static       void setActivateTexture(void *func);
@@ -63,8 +65,8 @@
 };
 
 
- bool ADM_glHasActiveTexture(void);
- bool ADM_glHasARB(void);
+ bool ADM_OPENGL6_EXPORT ADM_glHasActiveTexture(void);
+ bool ADM_OPENGL6_EXPORT ADM_glHasARB(void);
 
 
 
@@ -72,7 +74,7 @@
  *  \class ADM_coreQtGl
  *  \brief base class for all QtGl video filters
  */
-class  ADM_coreQtGl
+class  ADM_OPENGL6_EXPORT ADM_coreQtGl
 {
 protected:

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownloadTexture.cpp -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownloadTexture.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_flyPreview.h -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_flyPreview.h Changed

@@ -1,26 +1,17 @@
 #ifndef FLY_PREVIEW_H
 #define FLY_PREVIEW_H
-class flyPreview : public ADM_flyDialogQt4
+class flyPreview : public ADM_flyDialogYuv
 {
 public:
-	uint8_t process(void) {return 1;}
+	bool    process(void) {return 1;}
 	uint8_t download(void) {return 1;}
 	uint8_t upload(void) {return 1;}
 	uint8_t cleanup(void) {return 1;}
-#if 0
-	uint8_t setData(uint8_t *buffer) 
-        {
-#warning FIXME  NO DISPLAY   
-            action->process();
-            //_rgb->convert(buffer, _rgbBufferOut); 
-            return 1;
-        }
-#endif
-	flyPreview(uint32_t width, uint32_t height, void *canvas) : 
-	  ADM_flyDialogQt4(width, height, NULL, canvas, NULL, true, RESIZE_NONE) 
-            {
-                
-            };
+                flyPreview(QDialog *parent,uint32_t width, uint32_t height, ADM_QCanvas *canvas) : 
+                    ADM_flyDialogYuv(parent,width, height, NULL, canvas, NULL,  RESIZE_AUTO) 
+                {
+
+                };
 	virtual ~flyPreview(void) 
             {
 
@@ -31,12 +22,18 @@
 /**
     \class flySeekablePreview
 */
-class flySeekablePreview : public ADM_flyDialogQt4
+class flySeekablePreview : public ADM_flyDialogYuv
 {
 protected:
     void *cookie;
     CookieFunc cookieFunc;
 public:
+        flySeekablePreview(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *videoStream, ADM_QCanvas *canvas, QSlider *slider) : 
+	  ADM_flyDialogYuv(parent,width, height, videoStream, canvas, slider,  RESIZE_AUTO) 
+        {
+                cookie=NULL;cookieFunc=NULL;
+        };
+        virtual ~flySeekablePreview(void) {};
 	uint8_t processYuv(ADMImage *in,ADMImage *out) 
             {
                 out->duplicate(in);
@@ -45,23 +42,18 @@
 	uint8_t download(void) {return 1;}
 	uint8_t upload(void) {return 1;}
 	uint8_t cleanup(void) {return 1;}
-    bool    setCurrentPts(uint64_t pts)
-            {
-                if(cookieFunc)              // Used as a callback to update timestamp
-                    cookieFunc(cookie,pts);
-                return true;
-            }
-	flySeekablePreview(uint32_t width, uint32_t height, ADM_coreVideoFilter *videoStream, void *canvas, void *slider) : 
-	  ADM_flyDialogQt4(width, height, videoStream, canvas, slider, true, RESIZE_LAST) 
+        bool    setCurrentPts(uint64_t pts)
         {
-                cookie=NULL;cookieFunc=NULL;
-        };
-	virtual ~flySeekablePreview(void) {};
-    bool setCookieFunc(CookieFunc cookieFunc, void *cookie)
+            if(cookieFunc)              // Used as a callback to update timestamp
+                cookieFunc(cookie,pts);
+            return true;
+        }
+	
+        bool setCookieFunc(CookieFunc cookieFunc, void *cookie)
         {
-                this->cookieFunc=cookieFunc;
-                this->cookie=cookie;
-                return true;
+            this->cookieFunc=cookieFunc;
+            this->cookie=cookie;
+            return true;
         }
 };
 #endif

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp Changed

@@ -37,39 +37,46 @@
 
 namespace ADM_Qt4CoreUIToolkit
 {
-
+/**
+ * \class DIA_workingQt4
+ */
 class DIA_workingQt4 : public DIA_workingBase
 {
 
 protected:
-        virtual void 	    postCtor( void ) ;
+        virtual void         postCtor( void ) ;
 public:
-                            DIA_workingQt4( const char *title=NULL );
-        virtual		        ~DIA_workingQt4();
-            // If returns 1 -> Means aborted
-        virtual uint8_t  	update(uint32_t percent);
-        virtual uint8_t 	update(uint32_t current,uint32_t total);
-        virtual uint8_t  	isAlive (void );
-                void            closeDialog(void);
+                             DIA_workingQt4( const char *title=NULL );
+        virtual              ~DIA_workingQt4();
+            
+        virtual uint8_t      update(uint32_t percent);  // If returns 1 -> Means aborted
+        virtual uint8_t      update(uint32_t current,uint32_t total); // If returns 1 -> Means aborted
+        virtual uint8_t      isAlive (void );
+                void         closeDialog(void);
         
 };
-//********************************************************
-
+/**
+ * 
+ * @param title
+ */
 DIA_workingQt4::DIA_workingQt4(const char *title) : DIA_workingBase(title)
 {
-	workWindow *wind = new workWindow(qtLastRegisteredDialog());
-	qtRegisterDialog(wind);
-        _priv=(void *)wind;
-	wind->setWindowTitle(title);
-	postCtor();  
+    workWindow *wind = new workWindow(qtLastRegisteredDialog());
+    qtRegisterDialog(wind);
+    _priv=(void *)wind;
+    wind->setWindowTitle(title);
+    postCtor();  
 }
-
+/**
+ * 
+ */
 void DIA_workingQt4 :: postCtor( void )
 {
-  workWindow *wind=(workWindow *)_priv; ADM_assert(wind);
-      wind->show();
-      lastper=0;
-      _nextUpdate=0;
+    workWindow *wind=(workWindow *)_priv; 
+    ADM_assert(wind);
+    wind->show();
+    lastper=0;
+    _nextUpdate=0;
 }
 /**
  * 
@@ -83,7 +90,8 @@
     UI_purge();
     if(!_priv) 
         return 1;
-    workWindow *wind=(workWindow *)_priv; ADM_assert(wind);
+    workWindow *wind=(workWindow *)_priv; 
+    ADM_assert(wind);
     if(!wind->active)
     {
         return true;
@@ -105,7 +113,7 @@
     lastper=percent;
 
     uint32_t hh,mm,ss,mms;
-    char string[9];
+    char string[32]; // keep margin
 
     ms2time(elapsed,&hh,&mm,&ss,&mms);
     sprintf(string,"%02d:%02d:%02d",hh,mm,ss);
@@ -128,51 +136,65 @@
 
     return 0;
 }
-
+/**
+ * 
+ * @param cur
+ * @param total
+ * @return 
+ */
 uint8_t DIA_workingQt4::update(uint32_t cur, uint32_t total)
 {
-        double d,n;
-        uint32_t percent;
-        UI_purge();
-        if(!_priv) return 1;
-        if(!total) return 0;
-
-        d=total;
-        n=cur;
-        n=n*100.;
+    double d,n;
+    uint32_t percent;
+    UI_purge();
+    if(!_priv) return 1;
+    if(!total) return 0;
 
-        n=n/d;
+    d=total;
+    n=cur;
+    n=n*100.;
 
-        percent=(uint32_t )floor(n);
-        return update(percent);
+    n=n/d;
 
+    percent=(uint32_t )floor(n);
+    if(percent<0) percent=0;
+    if(percent>100) percent=100;
+    return update(percent);
 }
-
+/**
+ * 
+ * @return 
+ */
 uint8_t DIA_workingQt4::isAlive (void )
 {
-	if(!_priv) return 0;
-    workWindow *wind=(workWindow *)_priv; ADM_assert(wind);
-	return wind->active;
+    if(!_priv) return 0;
+    workWindow *wind=(workWindow *)_priv; 
+    ADM_assert(wind);
+    return wind->active;
 }
-
+/**
+ * 
+ */
 DIA_workingQt4::~DIA_workingQt4()
 {
     closeDialog();
 }
-
+/**
+ * 
+ */
 void DIA_workingQt4::closeDialog(void)
 {
-	workWindow *wind = (workWindow*)_priv;
-	ADM_assert(wind);
+    workWindow *wind = (workWindow*)_priv;
+    ADM_assert(wind);
 
-	if (wind)
-	{
-		qtUnregisterDialog(wind);
-		delete wind;
-	}
+    if (wind)
+    {
+        qtUnregisterDialog(wind);
+        delete wind;
+    }
 
-	wind = NULL;
-	_priv = NULL;
+    wind = NULL;
+    _priv = NULL;
 }
 
 /**

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.h -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.h Changed

@@ -1,23 +1,38 @@
-#ifndef Q_working_h
-#define Q_working_h
+/***************************************************************************
+    copyright            : (C) 2001 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
 
-#include "ui_working.h"
 
+#pragma once
+#include "ui_working.h"
+/**
+ * \class workWindow
+ */
 class workWindow : public QDialog
 {
-	Q_OBJECT
+    Q_OBJECT
     
 public:
-    bool active;
-	workWindow(QWidget *parent);
-	Ui_workingDialog *ui;
+                        workWindow(QWidget *parent);
+    Ui_workingDialog    *ui;
+    bool                active;
 public slots:
-    void stop(bool a);
+    void                stop(bool a);
 protected:
-  void closeEvent(QCloseEvent *event)
+    void                closeEvent(QCloseEvent *event)
     {
         stop(true);
     }
       
 };
-#endif	// Q_working_h
+

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp Changed

@@ -17,6 +17,12 @@
 
 #include "Q_seekablePreview.h"
 #include "ADM_vidMisc.h"
+/**
+ * 
+ * @param parent
+ * @param videoStream
+ * @param defaultFrame
+ */
 Ui_seekablePreviewWindow::Ui_seekablePreviewWindow(QWidget *parent, ADM_coreVideoFilter *videoStream, uint32_t defaultFrame) : QDialog(parent)
 {
 	ui.setupUi(this);
@@ -25,11 +31,12 @@
 	canvas = NULL;
 
 	resetVideoStream(videoStream);
+        
+        seekablePreview->addControl(ui.toolLayout);
 	seekablePreview->sliderSet(defaultFrame);
 	seekablePreview->sliderChanged();
 
 	connect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
-    connect(ui.next,SIGNAL(clicked()),this,SLOT(nextImage()));
 }
 
 Ui_seekablePreviewWindow::~Ui_seekablePreviewWindow()
@@ -37,10 +44,19 @@
 	delete seekablePreview;
 	delete canvas;
 }
-void Ui_seekablePreviewWindow::nextImage(void)
+
+/**
+ * 
+ * @return 
+ */
+bool  Ui_seekablePreviewWindow::nextImage(void)
 {
-    seekablePreview->nextImage();
+    return seekablePreview->nextImage();
 }
+/**
+ * 
+ * @param videoStream
+ */
 void Ui_seekablePreviewWindow::resetVideoStream(ADM_coreVideoFilter *videoStream)
 {
 	if (seekablePreview)
@@ -54,18 +70,22 @@
 
 	canvas = new ADM_QCanvas(ui.frame, canvasWidth, canvasHeight);
 	canvas->show();
-	seekablePreview = new flySeekablePreview(canvasWidth, canvasHeight, videoStream, canvas, ui.horizontalSlider);	
-    seekablePreview->setCookieFunc(setCurrentPtsCallback,this);
-//#warning FIXME NO UPDATE
-//	seekablePreview->process();
+	seekablePreview = new flySeekablePreview(this,canvasWidth, canvasHeight, videoStream, canvas, ui.horizontalSlider);	
+        seekablePreview->setCookieFunc(setCurrentPtsCallback,this);
 	seekablePreview->sliderChanged();
 }
-
+/**
+ * 
+ * @param value
+ */
 void Ui_seekablePreviewWindow::sliderChanged(int value)
 {
 	seekablePreview->sliderChanged();
 }
-
+/**
+ * 
+ * @return 
+ */
 uint32_t Ui_seekablePreviewWindow::frameIndex()
 {
 	return seekablePreview->sliderGet();
@@ -93,4 +113,4 @@
     ui.label->setText(s);
     return true;
 }
-// EOF
\ No newline at end of file
+// EOF

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h Changed

@@ -19,9 +19,9 @@
 #include "ui_seekablePreview.h"
 
 #include "ADM_assert.h"
-//#include "ADM_videoFilter.h"
-#include "DIA_flyDialog.h"
+#include "DIA_flyDialogQt4.h"
 #include "../ADM_dialog/DIA_flyPreview.h"
+#include <QTimer>
 
 class Ui_seekablePreviewWindow : public QDialog
 {
@@ -29,16 +29,18 @@
 protected:
     static bool setCurrentPtsCallback(void *cookie,uint64_t pts);
 public:
-	ADM_QCanvas *canvas;
+	ADM_QCanvas         *canvas;
 	flySeekablePreview *seekablePreview;
 	Ui_seekablePreviewDialog ui;
-	Ui_seekablePreviewWindow(QWidget *parent, ADM_coreVideoFilter *videoStream, uint32_t defaultFrame = 0);
-	~Ui_seekablePreviewWindow();
-	void resetVideoStream(ADM_coreVideoFilter *videoStream);
+        
+public:        
+                Ui_seekablePreviewWindow(QWidget *parent, ADM_coreVideoFilter *videoStream, uint32_t defaultFrame = 0);
+                ~Ui_seekablePreviewWindow();
+	void    resetVideoStream(ADM_coreVideoFilter *videoStream);
 	uint32_t frameIndex();
-    bool      setTime(uint64_t timestamp);
+        bool     setTime(uint64_t timestamp);
 
 public slots:
 	void sliderChanged(int value);
-    void nextImage(void);
+        bool nextImage(void);
 };

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui Changed

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>441</width>
+    <width>464</width>
     <height>378</height>
    </rect>
   </property>
@@ -19,109 +19,75 @@
   <property name="windowTitle">
    <string>Preview</string>
   </property>
-  <layout class="QFormLayout" name="formLayout">
-   <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
-       <item>
-        <widget class="QFrame" name="frame">
-         <property name="minimumSize">
-          <size>
-           <width>320</width>
-           <height>240</height>
-          </size>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
+      <widget class="QFrame" name="frame">
+       <property name="minimumSize">
+        <size>
+         <width>320</width>
+         <height>240</height>
+        </size>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+      </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QSlider" name="horizontalSlider">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
      </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <property name="sizeConstraint">
-        <enum>QLayout::SetFixedSize</enum>
+      <widget class="QSlider" name="horizontalSlider">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-       <item>
-        <widget class="QPushButton" name="next">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>next</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>00:00:00.000</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>00:00:00.000</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
+   <item>
+    <layout class="QHBoxLayout" name="toolLayout"/>
+   </item>
+   <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress_win32.cpp -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress_win32.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp Changed

@@ -1037,6 +1037,7 @@
     bool autoUpdateEnabled=false;
     if(prefs->get(UPDATE_ENABLED,&autoUpdateEnabled))
     {
+#ifndef _MSC_VER
         if(autoUpdateEnabled)
         {
             // Mark last check
@@ -1054,6 +1055,7 @@
                 ADM_checkForUpdate(&MainWindow::updateCheckDone);
             }
         }
+#endif
     }
     
     myApplication->exec();
@@ -1527,6 +1529,34 @@
     }
 }
 /**
+ *   \fn UI_requiredWidth
+ *   \brief calculate the horizontal space occupied by the coded widget incl. some margin
+ */
+uint32_t UI_requiredWidth(void)
+{
+    uint32_t reqw=18; // 2 x 9px margin
+    if(WIDGET(codecWidget)->isVisible())
+        reqw += WIDGET(codecWidget)->frameSize().width() + 6; // with codec widget visible a small extra margin is necessary
+    if(WIDGET(toolBar)->orientation()==Qt::Vertical && WIDGET(toolBar)->isVisible() && false==WIDGET(toolBar)->isFloating())
+        reqw += WIDGET(toolBar)->frameSize().width();
+    return reqw;
+}
+/**
+ *   \fn UI_requiredHeight
+ *   \brief calculate the vertical space occupied by widgets above and below the video window
+ */
+uint32_t UI_requiredHeight(void)
+{
+    uint32_t reqh=18; // 2 x 9px margin
+    if(WIDGET(menubar)->isVisible())
+        reqh += WIDGET(menubar)->height();
+    if(WIDGET(toolBar)->isVisible() && false==WIDGET(toolBar)->isFloating() && WIDGET(toolBar)->orientation()==Qt::Horizontal)
+        reqh += WIDGET(toolBar)->frameSize().height();
+    if(WIDGET(navigationWidget)->isVisible() || WIDGET(selectionWidget)->isVisible() || WIDGET(volumeWidget)->isVisible() || WIDGET(audioMetreWidget)->isVisible())
+        reqh += WIDGET(navigationWidget)->frameSize().height();
+    return reqh;
+}
+/**
     \fn UI_setAudioTrackCount
 */
 void UI_setAudioTrackCount( int nb )

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui Changed

@@ -1438,16 +1438,10 @@
    </widget>
   </widget>
   <widget class="QDockWidget" name="selectionWidget">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
    <property name="minimumSize">
     <size>
-     <width>192</width>
-     <height>163</height>
+     <width>160</width>
+     <height>150</height>
     </size>
    </property>
    <property name="features">
@@ -1603,8 +1597,8 @@
    </attribute>
    <widget class="QWidget" name="dockWidgetContents_5">
     <layout class="QVBoxLayout" name="verticalLayout_4">
-     <property name="topMargin">
-      <number>0</number>
+     <property name="alignment">
+      <set>Qt::AlignHCenter</set>
      </property>
      <item>
       <widget class="QToolButton" name="toolButtonAudioToggle">
@@ -1619,7 +1613,7 @@
        </property>
        <property name="minimumSize">
         <size>
-         <width>0</width>
+         <width>22</width>
          <height>22</height>
         </size>
        </property>
@@ -1639,22 +1633,6 @@
       </widget>
      </item>
      <item>
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::MinimumExpanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
       <widget class="QSlider" name="horizontalSlider_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -1664,8 +1642,8 @@
        </property>
        <property name="minimumSize">
         <size>
-         <width>0</width>
-         <height>30</height>
+         <width>22</width>
+         <height>50</height>
         </size>
        </property>
        <property name="maximum">

avidemux_2.6.15.tar.gz/avidemux/qt4/ADM_userInterfaces/ui_support.cpp -> avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ui_support.cpp Changed

avidemux_2.6.15.tar.gz/avidemux/qt4/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux/qt4/CMakeLists.txt Changed

@@ -16,7 +16,31 @@
 	SET(AVIDEMUX_FAKEROOT "${FAKEROOT}/")
 endif(NOT FAKEROOT)
 
+#-----------------------------------
+# Set extra libs, system dependant
+#-----------------------------------
+# -- Windows --
+IF(WIN32)
+	IF(MSVC)
+			LIST(APPEND PlatformLibs  Qt5::WinMain)
+	ENDIF(MSVC)
+	IF(MINGW)
+		LIST(APPEND PlatformLibs   "-lm -lstdc++")
+		LIST(APPEND PlatformLibs   "winmm -mwindows -Wl,--export-all-symbols")
+	ENDIF (MINGW)
+# -- Windows --
+ELSE(WIN32) # OSx, linux, BSD
+		LIST(APPEND PlatformLibs   "-lm -lstdc++")
+		IF(APPLE)  # OSX
+				LIST(APPEND PlatformLibs  "-framework CoreServices -framework CoreAudio -framework AudioUnit -framework Carbon")
+				LIST(APPEND PlatformLibs  "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
+		ELSE(APPLE)
+			LIST(APPEND PlatformLibs   "X11") # Linux, BSD
+		ENDIF(APPLE)
+ENDIF(WIN32)
 
+#
+#
 SET(ADM_HEADER_DIR ${AVIDEMUX_FAKEROOT}${CMAKE_INSTALL_PREFIX}/include/avidemux/${AVIDEMUX_API_VERSION})
 SET(ADM_CMAKE_DIR  ${ADM_HEADER_DIR}/cmake)
 # Common definitions...
@@ -76,14 +100,16 @@
 ###########################################
 # Add job control
 ###########################################
-ADD_SUBDIRECTORY(ADM_jobs)
+IF(NOT MSVC)
+    ADD_SUBDIRECTORY(ADM_jobs)
+ENDIF(NOT MSVC)
 ADD_SUBDIRECTORY(ADM_update)
 IF(USE_OPENGL)
     ADD_SUBDIRECTORY(ADM_openGL)
 ENDIF(USE_OPENGL)
 
 ########################################
-# Add subdirectories 
+# Add common as a symlink or directly
 ########################################
 INCLUDE_DIRECTORIES(ADM_UIs/include/)
 
@@ -92,9 +118,9 @@
 else (WIN32 AND NOT CROSS)
 	# Make symlink else eclipe and kdev4 are puzzled by the tree structure
 	# Not needed for plain build
-	MESSAGE(STATUS "Creating common symlink in ${CMAKE_CURRENT_SOURCE_DIR}") 
+	MESSAGE(STATUS "Creating common symlink in ${CMAKE_CURRENT_SOURCE_DIR}")
 
-	execute_process(COMMAND rm -f common 	
+	execute_process(COMMAND rm -f common
                                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 	execute_process(COMMAND ln -s ../common .
                                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
@@ -102,19 +128,20 @@
 	ADD_SUBDIRECTORY(common ./commonQt4)
 endif (WIN32 AND NOT CROSS)
 
+# Add misc subdirs
 ADD_SUBDIRECTORY(ADM_UIs ./ADM_UIsQt4)
 ADD_SUBDIRECTORY(ADM_userInterfaces ./ADM_userInterfaces${QT_LIBRARY_EXTENSION})
 
 SDLify(../common/main.cpp)
-ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION='\"${ADM_SUBVERSION}\"'")
-ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")
-ADD_SOURCE_CFLAGS(../common/main.cpp "-DQT_FLAVOR='\"${QT_EXTENSION}\"'")
+ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
+ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION=\"${AVIDEMUX_VERSION}\"")
+ADD_SOURCE_CFLAGS(../common/main.cpp "-DQT_FLAVOR=\"${QT_EXTENSION}\"")
 
 ###########################################
-# Version Info
+# Icon for windows
 ###########################################
-if (WIN32)
-        WINDRESIFY(src) 
+if (WIN32 )
+        WINDRESIFY(src)
         SET(ADM_EXE_SRCS ${ADM_EXE_SRCS} ${src})
 endif (WIN32)
 
@@ -122,8 +149,14 @@
 # Executable
 ###########################################
 include_directories("${PTHREAD_INCLUDE_DIR}")
-ADD_EXECUTABLE(avidemux3_${QT_EXTENSION} ${ADM_EXE_SRCS})
-
+IF(MSVC)
+		SET(EXEC_TYPE "WIN32")
+ENDIF(MSVC)
+ADD_EXECUTABLE(avidemux3_${QT_EXTENSION} ${EXEC_TYPE} ${ADM_EXE_SRCS})
+IF(MSVC)
+	set_target_properties(avidemux3_${QT_EXTENSION} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
+	set_target_properties(avidemux3_${QT_EXTENSION} PROPERTIES WIN32_EXECUTABLE True)
+ENDIF(MSVC)
 ###########################################
 # Construct common libraries
 ###########################################
@@ -139,7 +172,7 @@
 	TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${_libName})
 ENDFOREACH (_libName ${coreLibs})
 
-#TARGET_LINK_LIBRARIES(avidemux3_qt4 ADM_filter6)
+
 
 #############################################
 # Add qt specific libs
@@ -149,8 +182,7 @@
 	ADM_filters${QT_LIBRARY_EXTENSION}
 	ADM_UI${QT_LIBRARY_EXTENSION}6
 	ADM_dialogQt4
-        ADM_update${QT_LIBRARY_EXTENSION}6
-           #ADM_editor6
+  ADM_update${QT_LIBRARY_EXTENSION}6
 	ADM_internalVideoFilter6
 	ADM_UI${QT_LIBRARY_EXTENSION}6
 	ADM_gui${QT_LIBRARY_EXTENSION}
@@ -180,30 +212,20 @@
 ###########################################
 # UI Specific
 ###########################################
-TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${PTHREAD_LIBRARIES}) 
+TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${PTHREAD_LIBRARIES})
 
 ###########################################
 # OS Specific
 ###########################################
 if (WIN32 OR APPLE)
 	set_property(TARGET avidemux3_${QT_EXTENSION} PROPERTY OUTPUT_NAME avidemux)
-else (WIN32 OR APPLE)
-	target_link_libraries(avidemux3_${QT_EXTENSION} X11)
 endif (WIN32 OR APPLE)
 
-IF (MINGW)
-	target_link_libraries(avidemux3_${QT_EXTENSION} winmm -mwindows -Wl,--export-all-symbols)
-ENDIF (MINGW)
 
 IF (APPLE)
 	IF (USE_SDL)
 		TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_libsdl)
 	ENDIF(USE_SDL)
-
-	target_link_libraries(avidemux3_${QT_EXTENSION} "-framework CoreServices -framework CoreAudio -framework AudioUnit -framework Carbon")
-
-	# for Leopard but it doesn't hurt Tiger
-	target_link_libraries(avidemux3_${QT_EXTENSION} "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
 ENDIF (APPLE)
 #
 # Needed for cross compiling
@@ -217,10 +239,12 @@
         TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_core6)
 endif(CROSS)
 
+TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${PlatformLibs})
+
+
 IF(QT_QTOPENGL_FOUND)
         target_link_libraries(avidemux3_${QT_EXTENSION} ${QT_QTOPENGL_LIBRARIES})
 ENDIF(QT_QTOPENGL_FOUND)
-target_link_libraries(avidemux3_${QT_EXTENSION} "-lm -lstdc++")
 #
 # i18n
 #
@@ -235,7 +259,7 @@
 
 include(admPackager)
 admPackager(qt4Package)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/config/${QT_EXTENSION}/config.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/${QT_EXTENSION}" COMPONENT dev) 
+INSTALL(FILES ${CMAKE_BINARY_DIR}/config/${QT_EXTENSION}/config.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/${QT_EXTENSION}" COMPONENT dev)
 
 
 # install headers

avidemux_2.6.15.tar.gz/avidemux/qt4/i18n/avidemux_de.ts -> avidemux_2.6.16.tar.gz/avidemux/qt4/i18n/avidemux_de.ts Changed

@@ -4487,7 +4487,7 @@
         <location line="+41"/>
         <location line="+41"/>
         <source>Configure</source>
-        <translation type="unfinished">Konfigurieren</translation>
+        <translation type="unfinished">&amp;Konfigurieren</translation>
     </message>
     <message>
         <source>Audio Filters</source>
@@ -4519,7 +4519,7 @@
         <location line="+41"/>
         <location line="+41"/>
         <source>Enabled</source>
-        <translation type="unfinished">aktivieren</translation>
+        <translation type="unfinished">ak&amp;tivieren</translation>
     </message>
     <message>
         <location line="-100"/>
@@ -4527,7 +4527,7 @@
         <location line="+41"/>
         <location line="+41"/>
         <source>Filters</source>
-        <translation type="unfinished">Filter</translation>
+        <translation type="unfinished">&amp;Filter</translation>
     </message>
 </context>
 <context>
@@ -17489,7 +17489,7 @@
     <message>
         <location line="+6"/>
         <source>Use advanced configuration</source>
-        <translation>_Erweiterte Konfiguration verwenden</translation>
+        <translation>&amp;Erweiterte Konfiguration verwenden</translation>
     </message>
     <message>
         <location line="+9"/>

avidemux_2.6.15.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts -> avidemux_2.6.16.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts Changed

@@ -405,7 +405,7 @@
     <message>
         <location line="+63"/>
         <source>Custom Size:</source>
-        <translation></translation>
+        <translation>Taille personnalisée:</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -430,17 +430,17 @@
     <message>
         <location line="-207"/>
         <source>Result</source>
-        <translation></translation>
+        <translation>Résultat</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Audio Size:</source>
-        <translation></translation>
+        <translation>Taille audio:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Video Size:</source>
-        <translation></translation>
+        <translation>Taille de la vidéo:</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -454,7 +454,7 @@
     <message>
         <location line="-101"/>
         <source>Total Size:</source>
-        <translation></translation>
+        <translation>Taille Totale:</translation>
     </message>
     <message>
         <location line="+120"/>
@@ -649,22 +649,22 @@
     <message>
         <location line="+20"/>
         <source>Calibrate</source>
-        <translation></translation>
+        <translation>Étalonner</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Skip All</source>
-        <translation></translation>
+        <translation>Tout passer</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Skip Glyph</source>
-        <translation></translation>
+        <translation>Passer Glyphe</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Ignore</source>
-        <translation></translation>
+        <translation>Ignorer</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -689,7 +689,7 @@
     <message>
         <location line="+7"/>
         <source>Nb Lines :</source>
-        <translation></translation>
+        <translation>Nb Lignes:</translation>
     </message>
 </context>
 <context>
@@ -750,7 +750,7 @@
     <message>
         <location line="+14"/>
         <source>File being written </source>
-        <translation>Ecriture fichier</translation>
+        <translation>Écriture fichier</translation>
     </message>
     <message>
         <location line="-7"/>
@@ -1433,7 +1433,7 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+210"/>
         <source>Decode video using DXVA2 (windows)</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser DXVA2 pour décoder (Windows)</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1458,7 +1458,7 @@
     <message>
         <location line="+1"/>
         <source>_Revert to saved default output settings on video load</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Revenir aux paramètres par défaut enregistrés lors du chargement vidéo</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1727,7 +1727,7 @@
     <message>
         <location line="+1"/>
         <source>Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>Refaire</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2654,13 +2654,13 @@
     <message>
         <location line="+105"/>
         <source>Something failed when appending</source>
-        <translation type="unfinished"></translation>
+        <translation>Quelque chose a échoué lors de l'ajout</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+255"/>
         <source>Something bad happened (II)</source>
-        <translation type="unfinished"></translation>
+        <translation>Quelque chose d'horrible est arrivé (II)</translation>
     </message>
     <message>
         <location line="-56"/>
@@ -2894,17 +2894,17 @@
         <location line="+11"/>
         <location line="+38"/>
         <source>Done</source>
-        <translation type="unfinished"></translation>
+        <translation>Fait</translation>
     </message>
     <message>
         <location line="-38"/>
         <source>Saved %d images.</source>
-        <translation type="unfinished"></translation>
+        <translation>%d images sauvées.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Could not save all images.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d'enregistrer toutes les images.</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -2914,38 +2914,39 @@
     <message>
         <location line="+0"/>
         <source>Saving %s as a BMP file failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'enregistrement %s en tant que fichier BMP échoué</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>File %s has been successfully saved.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le fichier %s a été enregistré avec succès.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Echec</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>File %s was NOT saved correctly.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le fichier %s n'a pas été enregistré correctement.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Cannot get tinyPÿ script engine</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d'obtenir le moteur de script tinyPÿ</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Cannot add job %s</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d'ajouter le job %s</translation>
     </message>
     <message>
         <location filename="../../common/gui_savenew.cpp" line="-211"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
-        <translation type="unfinished"></translation>
+        <translation>Réutiliser les données précédentes du premier passage ?
+Attention, les paramètres doivent être proche.</translation>
     </message>
     <message>
         <location line="+138"/>
@@ -2958,30 +2959,32 @@
     <message>
         <location line="-36"/>
         <source>Cannot instantiate video chain</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d'instancier la chaîne vidéo</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+24"/>
         <source>Cannot create encoder</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de créer l'encodeur</translation>
     </message>
     <message>
         <location line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de configurer le codec. Bitrate trop bas?</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de configurer l'encodeur audio, assurez-vous que votre flux est compatible avec l'encodeur audio (nombre de canaux, bitrate, format)</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>The video is in copy mode but the cut points are not on keyframes.
 The video will be saved but there will be corruption at cut point(s).
 Do you want to continue anyway ?</source>
-        <translation type="unfinished"></translation>
+        <translation>La vidéo est en mode copie, mais les points de coupure ne sont pas sur les images clés.
+La vidéo sera enregistrée, mais il y aura des corruption au point de coupure(s).
+Voulez-vous continuer ?</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -2992,22 +2995,22 @@
     <message>
         <location line="-26"/>
         <source>Cannot instantiate muxer</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d'instancier muxer</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Cannot open </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ne peut pas ouvrir</translation>
     </message>
     <message>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
-        <translation type="unfinished">Désactivé</translation>
+        <translation>Désactivé</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Auto-detect</source>
-        <translation type="unfinished">Détection auto</translation>
+        <translation>Détection auto</translation>
     </message>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-9"/>
@@ -3022,42 +3025,42 @@
     <message>
         <location line="+1"/>
         <source>_Greyscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Niveaux de &amp;gris</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Turbo mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Mode Turbo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C_hroma optimizer</source>
-        <translation type="unfinished"></translation>
+        <translation>Optimiseur C&amp;hroma</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Main</source>
-        <translation type="unfinished"></translation>
+        <translation>Principal</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Very Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Très Bas</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Medium</source>
-        <translation type="unfinished">Moyenne</translation>
+        <translation>Moyenne</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Very High</source>
-        <translation type="unfinished"></translation>
+        <translation>Très Haut</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ultra High</source>
-        <translation type="unfinished"></translation>
+        <translation>Ultra Haut</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3077,17 +3080,17 @@
     <message>
         <location line="+1"/>
         <source>Limited Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Recherche Limitée</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Medium Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Recherche moyenne</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Wide Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Recherche Large</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3420,20 +3423,21 @@
         <location line="-84"/>
         <location line="+85"/>
         <source>Please free up some space and press RETRY to try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Veuillez libérer de l'espace et appuyez sur Re-essayer.</translation>
     </message>
     <message>
         <location line="-78"/>
         <source>can&apos;t open &quot;%s&quot;: %u (%s)
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Ne peut pas ouvrir  &quot;%s&quot;: %u (%s)
+</translation>
     </message>
     <message>
         <location line="+75"/>
         <source>can&apos;t write to file &quot;%s&quot;: %s
 %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Ne peut pas écrire dans le fichier &quot;%s&quot;: %s</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3455,7 +3459,7 @@
         <location line="+7"/>
         <source>can&apos;t write to file &quot;%s&quot;: %u (%s)
 </source>
-        <translation></translation>
+        <translation>Ne peut pas écrire dans le fichier &quot;%s&quot;: %u (%s)</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-7"/>
@@ -3494,18 +3498,19 @@
     <message>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
         <source>Internal error finding codec 0x%x</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur interne pour trouver le codec 0x%x</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Internal error opening 0x%x</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur interne lors de l'ouverture 0x%x</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+0"/>
         <source>Core has been compiled without DXVA2 support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Core a été compilé sans le support DXVA2, mais l'application a été compilée avec elle.
+Incompatibilité d'installation</translation>
     </message>
 </context>
 <context>
@@ -3526,13 +3531,14 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+158"/>
         <source>File Error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur de fichier</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot open file
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ne peut pas ouvrir le fichier
+</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp" line="+471"/>
@@ -7695,23 +7701,24 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
         <source>Error</source>
-        <translation type="unfinished">Erreur</translation>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;index de ce fichier a été créé avec une version plus ancienne d&apos;avidemux.
+Veuillez supprimer le fichier idx2 et rouvrir.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
         <source>Indexing</source>
-        <translation type="unfinished">Indexation</translation>
+        <translation>Indexation</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Il existe plusieurs fichiers avec des noms de fichiers séquentiels. Doivent-ils tous être chargés ?</translation>
     </message>
 </context>
 <context>
@@ -7719,48 +7726,48 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner un fichier audio</translation>
     </message>
     <message>
         <location line="+14"/>
         <location line="+140"/>
         <source>Error</source>
-        <translation type="unfinished">Erreur</translation>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location line="-140"/>
         <source>Cannot use that file as audio track</source>
-        <translation type="unfinished">Impossible d&apos;utiliser ce fichier comme piste audio</translation>
+        <translation>Impossible d&apos;utiliser ce fichier comme piste audio</translation>
     </message>
     <message>
         <location line="+140"/>
         <source>Some tracks are used multiple times</source>
-        <translation type="unfinished"></translation>
+        <translation>Certaines pistes sont utilisées plusieurs fois</translation>
     </message>
     <message>
         <location line="+126"/>
         <source>Track </source>
-        <translation type="unfinished"></translation>
+        <translation>Piste </translation>
     </message>
     <message>
         <location line="+0"/>
         <source> from video</source>
-        <translation type="unfinished"></translation>
+        <translation> de la vidéo</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>File </source>
-        <translation type="unfinished"></translation>
+        <translation>Fichier </translation>
     </message>
     <message>
         <location line="+34"/>
         <source>.... Add audio track</source>
-        <translation type="unfinished"></translation>
+        <translation>... Ajouter une piste audio</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>copy</source>
-        <translation type="unfinished"></translation>
+        <translation>copier</translation>
     </message>
 </context>
 <context>
@@ -7769,28 +7776,28 @@
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+57"/>
         <location line="+20"/>
         <source>Privileges Required</source>
-        <translation type="unfinished"></translation>
+        <translation>Privilèges requis</translation>
     </message>
     <message>
         <location line="-20"/>
         <location line="+20"/>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished"></translation>
+        <translation>Les privilèges root sont requis pour effectuer cette opération.</translation>
     </message>
     <message>
         <location line="+284"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
-        <translation type="unfinished">L&apos;encodage est en pause. Voulez vous reprendre ou abandonner ?</translation>
+        <translation>L&apos;encodage est en pause. Voulez vous reprendre ou abandonner ?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Resume</source>
-        <translation type="unfinished">Reprendre</translation>
+        <translation>Reprendre</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Abort</source>
-        <translation type="unfinished">Abandonner</translation>
+        <translation>Abandonner</translation>
     </message>
 </context>
 <context>
@@ -7799,18 +7806,18 @@
         <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
         <location line="+89"/>
         <source>All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tous les fichiers (*.*)</translation>
     </message>
     <message>
         <location line="-49"/>
         <location line="+67"/>
         <source> files (*.</source>
-        <translation type="unfinished"></translation>
+        <translation> fichiers (*.</translation>
     </message>
     <message>
         <location line="-39"/>
         <source>Overwrite file </source>
-        <translation type="unfinished"></translation>
+        <translation>Écraser le fichier </translation>
     </message>
 </context>
 <context>
@@ -7818,23 +7825,24 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+218"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Nouvelle version disponible&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Publié le %2.&lt;br&gt;Vous pouvez la télécharger ici&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Vous pouvez désactiver autoupdate dans les préférences.&lt;/small&gt;</translation>
     </message>
     <message>
         <location line="+212"/>
         <source>Recent Files</source>
-        <translation type="unfinished">Fichiers Récents</translation>
+        <translation>Fichiers Récents</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Recent Projects</source>
-        <translation type="unfinished">Projets Récents</translation>
+        <translation>Projets Récents</translation>
     </message>
     <message>
         <location line="+575"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
-        <translation type="unfinished"></translation>
+        <translation>L'application a rencontré un problème fatal
+L'édition en cours a été enregistrée et sera rechargée au prochain démarrage</translation>
     </message>
     <message>
         <location line="+258"/>
@@ -7844,7 +7852,7 @@
     <message>
         <location line="+257"/>
         <source> (%d track(s))</source>
-        <translation type="unfinished"></translation>
+        <translation> (%d piste(s))</translation>
     </message>
 </context>
 <context>
@@ -7857,7 +7865,7 @@
     <message>
         <location line="+4"/>
         <source> Project</source>
-        <translation type="unfinished"></translation>
+        <translation> Projet</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -7872,7 +7880,7 @@
     <message>
         <location line="+5"/>
         <source>Save &amp;As Project...</source>
-        <translation type="unfinished">Sauvegarder comme projet</translation>
+        <translation>Sauvegarder comme projet</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -7900,22 +7908,22 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="+13"/>
         <source>Ready</source>
-        <translation type="unfinished"></translation>
+        <translation>Prêt</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Succeeded</source>
-        <translation type="unfinished"></translation>
+        <translation>Réussi</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Echec</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Deleted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimé</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -7925,12 +7933,12 @@
     <message>
         <location line="+24"/>
         <source>Job Name</source>
-        <translation type="unfinished">Nom du job</translation>
+        <translation>Nom du job</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Statut</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -7951,32 +7959,32 @@
     <message>
         <location line="-14"/>
         <source>Delete job</source>
-        <translation type="unfinished">Détruire le job</translation>
+        <translation>Détruire le job</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Are you sure you want to delete %s job?</source>
-        <translation type="unfinished">Etes vous sur de vouloir détruire %s job ?</translation>
+        <translation>Êtes vous sur de vouloir détruire %s job ?</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Delete *all* job</source>
-        <translation type="unfinished">Detruire *tous* les jobs</translation>
+        <translation>Détruire *tous* les jobs</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Are you sure you want to delete ALL jobs?</source>
-        <translation type="unfinished">Etes vous sur de vouloir détruire TOUS les jobs ?</translation>
+        <translation>Êtes vous sur de vouloir détruire TOUS les jobs ?</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Already done</source>
-        <translation type="unfinished">Déjà fait</translation>
+        <translation>Déjà fait</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This script has already been successfully executed.</source>
-        <translation type="unfinished">Ce script a déjà été executé avec succés</translation>
+        <translation>Ce script a déjà été executé avec succés.</translation>
     </message>
 </context>
 <context>
@@ -7992,52 +8000,52 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+318"/>
         <source>Partial</source>
-        <translation type="unfinished"></translation>
+        <translation>Partiel</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This filter cannot be made partial</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce filtre ne peut pas être partiel</translation>
     </message>
     <message>
         <location line="+177"/>
         <source>Add</source>
-        <translation type="unfinished">Ajouter</translation>
+        <translation>Ajouter</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Remove</source>
-        <translation type="unfinished">Enlever</translation>
+        <translation>Enlever</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Configure</source>
-        <translation type="unfinished">Configurer</translation>
+        <translation>Configurer</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Move up</source>
-        <translation type="unfinished"></translation>
+        <translation>Déplacer vers le haut</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Move down</source>
-        <translation type="unfinished"></translation>
+        <translation>Déplacer vers le bas</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Make partial</source>
-        <translation type="unfinished"></translation>
+        <translation>Faire partiel</translation>
     </message>
     <message>
         <location line="+79"/>
         <source>Load video filters..</source>
-        <translation type="unfinished"></translation>
+        <translation>Charger les filtres vidéo..</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save video filters..</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer les filtres vidéo..</translation>
     </message>
 </context>
 <context>
@@ -8045,22 +8053,22 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+66"/>
         <source>Unknown</source>
-        <translation type="unfinished">Inconnu</translation>
+        <translation>Inconnu</translation>
     </message>
     <message>
         <location line="+94"/>
         <source>_Resume</source>
-        <translation type="unfinished">_Reprendre</translation>
+        <translation>&amp;Reprendre</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The processing is paused.</source>
-        <translation type="unfinished">L&apos;operation est en pause</translation>
+        <translation>L&apos;operation est en pause</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel it ?</source>
-        <translation type="unfinished">Annuler ?</translation>
+        <translation>Annuler ?</translation>
     </message>
 </context>
 <context>
@@ -8068,12 +8076,12 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+23"/>
         <source>No</source>
-        <translation type="unfinished">Non</translation>
+        <translation>Non</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Yes</source>
-        <translation type="unfinished">Oui</translation>
+        <translation>Oui</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -8108,14 +8116,15 @@
         <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Entrez vos commandes, puis appuyez sur le bouton évaluer ou CTRL + ENTRÉE.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can use CTRL+PageUP and CTRL+Page Down to recall previous commands
 Ready.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Vous pouvez utiliser CTRL + Page Précédente et CTRL + Page Suivante pour rappeler les commandes précédentes
+Prêt.</translation>
     </message>
 </context>
 <context>
@@ -8123,14 +8132,14 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
         <source>Alert</source>
-        <translation type="unfinished">Alerte</translation>
+        <translation>Alerte</translation>
     </message>
     <message>
         <location line="+6"/>
         <location line="+25"/>
         <location line="+25"/>
         <source>Info</source>
-        <translation type="unfinished">Information</translation>
+        <translation>Information</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -8155,7 +8164,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="+82"/>
         <source>Open Avidemux</source>
-        <translation type="unfinished">Ouvrir Avidemux</translation>
+        <translation>Ouvrir Avidemux</translation>
     </message>
 </context>
 <context>
@@ -8163,7 +8172,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
         <source>Select Idx File</source>
-        <translation type="unfinished"></translation>
+        <translation>Choix du Fichie Idx</translation>
     </message>
 </context>
 <context>
@@ -8234,7 +8243,7 @@
     <message>
         <location line="+275"/>
         <source>_New frame rate:</source>
-        <translation type="unfinished">Nouveau nombre d&apos;i/s:</translation>
+        <translation type="unfinished">&amp;Nouveau nombre d&apos;i/s:</translation>
     </message>
     <message>
         <location line="-315"/>
@@ -8277,7 +8286,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
         <source>Width and height cannot be odd</source>
-        <translation type="unfinished">La largeur ou la hauteur ne peuvent être impaires</translation>
+        <translation>La largeur ou la hauteur ne peuvent être impaires</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+80"/>
@@ -8305,7 +8314,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+13"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+13"/>
         <source>Resize</source>
-        <translation type="unfinished">Redimenssionner</translation>
+        <translation>Redimenssionner</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -8320,7 +8329,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
         <source>Aspect Ratio</source>
-        <translation type="unfinished">Rapport hauteur/largeur</translation>
+        <translation>Rapport hauteur/largeur</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -8335,7 +8344,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
         <source>Lock Aspect Ratio</source>
-        <translation type="unfinished">Vérrouiller le rapport h/l</translation>
+        <translation>Vérrouiller le rapport h/l</translation>
     </message>
     <message>
         <location line="+104"/>
@@ -8350,7 +8359,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+104"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+104"/>
         <source>Resize Dimensions</source>
-        <translation type="unfinished">Redimensionner vers </translation>
+        <translation>Redimensionner vers </translation>
     </message>
     <message>
         <location line="+20"/>
@@ -8365,7 +8374,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
         <source>Width:</source>
-        <translation type="unfinished">Largeur:</translation>
+        <translation>Largeur:</translation>
     </message>
     <message>
         <location line="+36"/>
@@ -8380,7 +8389,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+36"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+36"/>
         <source>Height:</source>
-        <translation type="unfinished">Hauteur:</translation>
+        <translation>Hauteur:</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -8395,7 +8404,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+35"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+35"/>
         <source>Round to the Nearest Multiple of 16</source>
-        <translation type="unfinished">Arrondir au multiple de 16</translation>
+        <translation>Arrondir au multiple de 16</translation>
     </message>
     <message>
         <location line="+75"/>
@@ -8410,7 +8419,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+75"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+75"/>
         <source>Percent</source>
-        <translation type="unfinished">Pourcent</translation>
+        <translation>Pourcent</translation>
     </message>
     <message>
         <location line="+70"/>
@@ -8425,7 +8434,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+70"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+70"/>
         <source>Error X / Y:</source>
-        <translation type="unfinished">Erreur X/Y:</translation>
+        <translation>Erreur X/Y:</translation>
     </message>
     <message>
         <location line="+58"/>
@@ -8440,7 +8449,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+58"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+58"/>
         <source>Resize Method:</source>
-        <translation type="unfinished">Méthode:</translation>
+        <translation>Méthode:</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -8455,7 +8464,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+8"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+8"/>
         <source>Bilinear</source>
-        <translation type="unfinished">Bilinéaire</translation>
+        <translation>Bilinéaire</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -8470,7 +8479,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
         <source>Bicubic</source>
-        <translation type="unfinished">Bicuibique</translation>
+        <translation>Bicuibique</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -8485,7 +8494,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
         <source>Lanzcos3</source>
-        <translation type="unfinished">Lanzcos3</translation>
+        <translation>Lanzcos3</translation>
     </message>
     <message>
         <location line="-398"/>
@@ -8654,17 +8663,17 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
         <location line="+163"/>
         <source>Rotate</source>
-        <translation type="unfinished">Rotation</translation>
+        <translation>Rotation</translation>
     </message>
     <message>
         <location line="-162"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
-        <translation type="unfinished">Angle de rotation (90/180/270);</translation>
+        <translation>Angle de rotation (90/180/270);</translation>
     </message>
     <message>
         <location line="+155"/>
         <source>None</source>
-        <translation type="unfinished">Aucun</translation>
+        <translation>Aucun</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8714,12 +8723,12 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="+20"/>
         <source>Preview</source>
-        <translation type="unfinished">Aperçu</translation>
+        <translation>Aperçu</translation>
     </message>
     <message>
         <location line="+76"/>
         <source>next</source>
-        <translation type="unfinished">Suivant</translation>
+        <translation>Suivant</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -8732,12 +8741,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp" line="+53"/>
         <source>Separate Fields</source>
-        <translation type="unfinished"></translation>
+        <translation>Champs séparés</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Split each image into 2 fields.</source>
-        <translation type="unfinished"></translation>
+        <translation>Divisez chaque image en 2 champs.</translation>
     </message>
 </context>
 <context>
@@ -8821,7 +8830,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+185"/>
         <source>No strategy</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucune stratégie</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8836,22 +8845,22 @@
     <message>
         <location line="+1"/>
         <source>NTSC converted from PAL</source>
-        <translation type="unfinished"></translation>
+        <translation>NTSC convertie depuis PAL</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Haut</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Bas</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Never</source>
-        <translation type="unfinished"></translation>
+        <translation>Jamais</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8861,12 +8870,12 @@
     <message>
         <location line="+1"/>
         <source>Always</source>
-        <translation type="unfinished"></translation>
+        <translation>Toujours</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>None</source>
-        <translation type="unfinished">Aucun</translation>
+        <translation>Aucun</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8886,67 +8895,67 @@
     <message>
         <location line="+1"/>
         <source>Process image (not fields)</source>
-        <translation type="unfinished"></translation>
+        <translation>Traitement image (pas les champs)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Process image (not fields), debug</source>
-        <translation type="unfinished"></translation>
+        <translation>Traitement image (pas les champs), déboguer</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>_Strategy:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Stratégie:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Field order:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ordre champ:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Postprocessing:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Post-traitement:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Try backward:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Essayer en arrière:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Direct threshold:</source>
-        <translation type="unfinished"></translation>
+        <translation>Seuil &amp;direct:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Backward threshold:</source>
-        <translation type="unfinished"></translation>
+        <translation>Seuil en &amp;arrière</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Noise threshold:</source>
-        <translation type="unfinished"></translation>
+        <translation>Seuil de b&amp;ruit</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Postp_rocessing threshold:</source>
-        <translation type="unfinished"></translation>
+        <translation>Seuil de post-t&amp;raitement</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Use chroma to decide</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Utiliser chroma pour décider</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Sho_w info</source>
-        <translation type="unfinished"></translation>
+        <translation>Voir &amp;info</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Debu_g</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Débo&amp;guer</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8964,26 +8973,27 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
         <source>Error</source>
-        <translation type="unfinished">Erreur</translation>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;index de ce fichier a été créé avec une version plus ancienne d&apos;avidemux.
+Veuillez supprimer le fichier idx2 et rouvrir.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+124"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Il existe plusieurs fichiers avec des noms de fichiers séquentiels. Devraient-ils tous être chargés?</translation>
     </message>
     <message>
         <location line="+9"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
         <source>Indexing</source>
-        <translation type="unfinished">Indexation</translation>
+        <translation>Indexation</translation>
     </message>
 </context>
 <context>
@@ -9110,22 +9120,22 @@
     <message>
         <location line="+1"/>
         <source>VDPAU deinterlacer (+resize).</source>
-        <translation type="unfinished">VDPAU de-entrelacement (+redimensionnement).</translation>
+        <translation>VDPAU de-entrelacement (+redimensionnement).</translation>
     </message>
     <message>
         <location line="+185"/>
         <source>Keep Top Field</source>
-        <translation type="unfinished">Garder le champs supérieur</translation>
+        <translation>Garder le champs supérieur</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep Bottom Field</source>
-        <translation type="unfinished">Garder le champs inférieur</translation>
+        <translation>Garder le champs inférieur</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double framerate</source>
-        <translation type="unfinished">Doubler le nombre d&apos;image par seconde</translation>
+        <translation>Doubler le nombre d&apos;image par seconde</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -9135,27 +9145,27 @@
     <message>
         <location line="+1"/>
         <source>_Resize:</source>
-        <translation type="unfinished">_Redimensionner</translation>
+        <translation>&amp;Redimensionner</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Deint Mode:</source>
-        <translation type="unfinished">Mode de _deentrelacement:</translation>
+        <translation>Mode de &amp;deentrelacement:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Width :</source>
-        <translation type="unfinished">Largeur:</translation>
+        <translation>Largeur:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Height :</source>
-        <translation type="unfinished">Hauteur:</translation>
+        <translation>Hauteur:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>vdpau</source>
-        <translation type="unfinished">vdpau</translation>
+        <translation>vdpau</translation>
     </message>
 </context>
 <context>
@@ -9223,17 +9233,17 @@
     <message>
         <location line="+133"/>
         <source>Width :</source>
-        <translation type="unfinished">Largeur:</translation>
+        <translation>Largeur:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Height :</source>
-        <translation type="unfinished">Hauteur:</translation>
+        <translation>Hauteur:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>vdpau</source>
-        <translation type="unfinished">vdpau</translation>
+        <translation>vdpau</translation>
     </message>
 </context>
 <context>
@@ -9241,12 +9251,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp" line="+47"/>
         <source>Vertical Flip</source>
-        <translation type="unfinished">Inversion verticale</translation>
+        <translation>Inversion verticale</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Vertically flip the image.</source>
-        <translation type="unfinished">Inverse l&apos;image verticalement.</translation>
+        <translation>Inverse l&apos;image verticalement.</translation>
     </message>
 </context>
 <context>
@@ -9289,7 +9299,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="+350"/>
         <source>_Quality:</source>
-        <translation type="unfinished">_Qualité:</translation>
+        <translation>&amp;Qualité:</translation>
     </message>
     <message>
         <location line="-19"/>
@@ -9370,22 +9380,22 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
         <source>Processing</source>
-        <translation type="unfinished">En cours</translation>
+        <translation>En cours</translation>
     </message>
     <message>
         <location line="+64"/>
         <source>Elapsed:</source>
-        <translation type="unfinished">Temps écoulé:</translation>
+        <translation>Temps écoulé:</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Time Remaining:</source>
-        <translation type="unfinished">Temps Restant:</translation>
+        <translation>Temps Restant:</translation>
     </message>
     <message>
         <location line="+113"/>
         <source>Cancel</source>
-        <translation type="unfinished">Annuler</translation>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location line="-87"/>
@@ -9414,12 +9424,12 @@
     <message>
         <location line="+33"/>
         <source>Custom</source>
-        <translation type="unfinished">Manuel</translation>
+        <translation>Manuel</translation>
     </message>
     <message>
         <location line="+411"/>
         <source>Target Bitrate:</source>
-        <translation type="unfinished">Bitrate cible :</translation>
+        <translation>Bitrate cible :</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9430,17 +9440,17 @@
     <message>
         <location line="-15"/>
         <source>Quantiser:</source>
-        <translation type="unfinished">Quantisation:</translation>
+        <translation>Quantisation:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Quality:</source>
-        <translation type="unfinished">Qualité:</translation>
+        <translation>Qualité:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished">Taille vidéo cible:</translation>
+        <translation>Taille vidéo cible:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9450,14 +9460,14 @@
     <message>
         <location line="+4"/>
         <source>Average Bitrate:</source>
-        <translation type="unfinished">Bitrate moyen:</translation>
+        <translation>Bitrate moyen:</translation>
     </message>
     <message>
         <location line="+68"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished">L&apos; optimisation Macroblock-Tree  nécessite  Variance Adaptive Quantisation. Variance Adaptive Quantisation va être automatiquement activée.
+        <translation>L&apos; optimisation Macroblock-Tree  nécessite  Variance Adaptive Quantisation. Variance Adaptive Quantisation va être automatiquement activée.
 
 Voulez vous procéder ?</translation>
     </message>
@@ -9466,7 +9476,7 @@
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished">L&apos; optimisation Macroblock-Tree  nécessite  Variance Adaptive Quantisation. Variance Adaptive Quantisation va être automatiquement activée.
+        <translation>L&apos; optimisation Macroblock-Tree  nécessite  Variance Adaptive Quantisation. Variance Adaptive Quantisation va être automatiquement activée.
 
 Voulez vous procéder ?</translation>
     </message>
@@ -9475,7 +9485,7 @@
         <location line="+69"/>
         <location line="+14"/>
         <source>Error</source>
-        <translation type="unfinished">Erreur</translation>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location line="-83"/>
@@ -9499,39 +9509,40 @@
     </message>
     <message>
         <location line="+0"/>
-        <source>Replace the following preset ?:</source>
-        <translation type="unfinished"></translation>
+        <source>Replace the following preset?:</source>
+        <translation>Remplacer le préréglage suivant ?</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Cannot save preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d'enregistrer le préréglage</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Cannot delete custom profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de supprimer le profil personnalisé</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Do you really want to delete the </source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez-vous vraiment supprimer le</translation>
     </message>
     <message>
         <location line="+1"/>
         <source> profile ?.
 If it is a system profile it will be recreated next time.</source>
-        <translation type="unfinished"></translation>
+        <translation> profile ?.
+S'il s'agit d'un profil système, il sera recréé la prochaine fois.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Delete preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer préréglage</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Delete</source>
-        <translation type="unfinished">Effacer</translation>
+        <translation>Effacer</translation>
     </message>
 </context>
 <context>
@@ -9555,7 +9566,7 @@
         <location line="+7"/>
         <location line="+3152"/>
         <source>Delete</source>
-        <translation type="unfinished">Effacer</translation>
+        <translation>Effacer</translation>
     </message>
     <message>
         <location line="-3110"/>
@@ -9570,7 +9581,7 @@
     <message>
         <location line="+6"/>
         <source>Use advanced configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser la configuration avancée</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -9703,7 +9714,7 @@
     <message>
         <location line="+8"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished">Taille vidéo cible:</translation>
+        <translation>Taille vidéo cible:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -9900,7 +9911,7 @@
         <location line="+450"/>
         <location line="+36"/>
         <source>Disabled</source>
-        <translation type="unfinished">Désactivé</translation>
+        <translation>Désactivé</translation>
     </message>
     <message>
         <location line="-481"/>
@@ -10306,7 +10317,7 @@
     <message>
         <location line="+13"/>
         <source>Normal</source>
-        <translation type="unfinished">Normale</translation>
+        <translation>Normale</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -10401,7 +10412,7 @@
     <message>
         <location line="+7"/>
         <source>Auto-detect</source>
-        <translation type="unfinished">Détection auto</translation>
+        <translation>Détection auto</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -10432,7 +10443,7 @@
     <message>
         <location line="+6"/>
         <source>Output</source>
-        <translation type="unfinished">Sortie</translation>
+        <translation>Sortie</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -10508,7 +10519,7 @@
     <message>
         <location line="+6"/>
         <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ces réglages ne sont que des suggestions pour l'équipement de lecture. À utiliser à vos risques et périls.</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -10522,27 +10533,27 @@
         <location line="+63"/>
         <location line="+73"/>
         <source>Undefined</source>
-        <translation type="unfinished"></translation>
+        <translation>Indéfini</translation>
     </message>
     <message>
         <location line="-235"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Montrer</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Crop</source>
-        <translation type="unfinished"></translation>
+        <translation>Recadrer</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Video Format:</source>
-        <translation type="unfinished"></translation>
+        <translation>Format Vidéo:</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Component</source>
-        <translation type="unfinished"></translation>
+        <translation>Composant</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -10732,7 +10743,7 @@
     <message>
         <location line="+10"/>
         <source>Cancel</source>
-        <translation type="unfinished">Annuler</translation>
+        <translation>Annuler</translation>
     </message>
 </context>
 <context>
@@ -10785,7 +10796,8 @@
         <location line="+0"/>
         <source>this mode has not been implemented
 </source>
-        <translation type="unfinished"></translation>
+        <translation>ce mode n'a pas été implémenté
+</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+185"/>
@@ -10795,12 +10807,12 @@
     <message>
         <location line="+33"/>
         <source>Custom</source>
-        <translation type="unfinished">Manuel</translation>
+        <translation>Manuel</translation>
     </message>
     <message>
         <location line="+357"/>
         <source>Target Bitrate:</source>
-        <translation type="unfinished">Bitrate cible :</translation>
+        <translation>Bitrate cible :</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10811,17 +10823,17 @@
     <message>
         <location line="-15"/>
         <source>Quantiser:</source>
-        <translation type="unfinished">Quantisation:</translation>
+        <translation>Quantisation:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Quality:</source>
-        <translation type="unfinished">Qualité:</translation>
+        <translation>Qualité:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished">Taille vidéo cible:</translation>
+        <translation>Taille vidéo cible:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10831,14 +10843,14 @@
     <message>
         <location line="+4"/>
         <source>Average Bitrate:</source>
-        <translation type="unfinished">Bitrate moyen:</translation>
+        <translation>Bitrate moyen:</translation>
     </message>
     <message>
         <location line="+63"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished">L&apos; optimisation Macroblock-Tree  nécessite  Variance Adaptive Quantisation. Variance Adaptive Quantisation va être automatiquement activée.
+        <translation>L&apos; optimisation Macroblock-Tree  nécessite  Variance Adaptive Quantisation. Variance Adaptive Quantisation va être automatiquement activée.
 
 Voulez vous procéder ?</translation>
     </message>
@@ -10847,7 +10859,7 @@
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished">L&apos; optimisation Macroblock-Tree  nécessite  Variance Adaptive Quantisation. Variance Adaptive Quantisation va être automatiquement activée.
+        <translation>L&apos; optimisation Macroblock-Tree  nécessite  Variance Adaptive Quantisation. Variance Adaptive Quantisation va être automatiquement activée.
 
 Voulez vous procéder ?</translation>
     </message>
@@ -10856,58 +10868,59 @@
         <location line="+69"/>
         <location line="+14"/>
         <source>Error</source>
-        <translation type="unfinished">Erreur</translation>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location line="-83"/>
         <source>Cannot load preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de charger le préréglage</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer le Profil</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation>Écraser</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Replace the following preset ?:</source>
-        <translation type="unfinished"></translation>
+        <translation>Remplacer le préréglage suivant ?:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Cannot save preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d'enregistrer le préréglage</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Cannot delete custom profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de supprimer le profil personnalisé</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Do you really want to delete the </source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez-vous vraiment supprimer le </translation>
     </message>
     <message>
         <location line="+1"/>
         <source> profile ?.
 If it is a system profile it will be recreated next time.</source>
-        <translation type="unfinished"></translation>
+        <translation> profile ?.
+S'il s'agit d'un profil système, il sera recréé la prochaine fois.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Delete preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer préréglage</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Delete</source>
-        <translation type="unfinished">Effacer</translation>
+        <translation>Effacer</translation>
     </message>
 </context>
 <context>
@@ -10925,13 +10938,13 @@
     <message>
         <location line="+17"/>
         <source>Save As</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer sous</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+2731"/>
         <source>Delete</source>
-        <translation type="unfinished">Effacer</translation>
+        <translation>Effacer</translation>
     </message>
     <message>
         <location line="-2689"/>
@@ -10946,7 +10959,7 @@
     <message>
         <location line="+6"/>
         <source>Use advanced configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser la configuration avancée</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -10961,7 +10974,7 @@
     <message>
         <location line="+51"/>
         <source>Tuning:</source>
-        <translation type="unfinished"></translation>
+        <translation>Réglage:</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -11068,7 +11081,7 @@
     <message>
         <location line="+21"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished">Taille vidéo cible:</translation>
+        <translation>Taille vidéo cible:</translation>
     </message>
     <message>
         <location line="+13"/>

avidemux_2.6.15.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts -> avidemux_2.6.16.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts Changed

@@ -42,7 +42,7 @@
     </message>
     <message>
         <source>_Time shift (ms):</source>
-        <translation type="obsolete">Сдвиг (ms):</translation>
+        <translation type="obsolete">Сдвиг (мs):</translation>
     </message>
     <message>
         <source>Time shift value (ms)</source>
@@ -1268,7 +1268,7 @@
     </message>
     <message>
         <source>_Delay (ms):</source>
-        <translation type="obsolete">Сдвиг (ms):</translation>
+        <translation type="obsolete">Сдвиг (мs):</translation>
     </message>
     <message>
         <source>Width and height cannot be 0</source>
@@ -2346,19 +2346,21 @@
     <message>
         <location line="-36"/>
         <source>Cannot find a demuxer for %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно найти демультиплексор для %s</translation>
     </message>
     <message>
         <location line="+62"/>
         <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно обьединить видео с различным разрешением. Использование частичного фильтра видео не исправит эту проблему. Выход следующий:
+1.) &quot;изменить размер&quot; / &quot;добавить рамки&quot; / &quot;обрезать&quot; потоки, приведя их к одному разрешению
+2.) склеить их вместе</translation>
     </message>
     <message>
         <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
         <source>Checking if timestamps are valid..</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Проверка правильности временных меток...</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -2369,7 +2371,13 @@
 If you just copy the video without reencoding,
  you should keep them.
 Drop timing informations ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Некоторые тайминги неправильны.
+Это случается при использовании некоторых программ для видеозахвата.
+При перекодировке эта информация будет сброшена,
+ иначе произойдет потеря кадров или порча видео.
+При прямом копировании видео без его перекодировки
+ они сохранятся.
+Сбросить информацию о таймингах?</translation>
     </message>
 </context>
 <context>
@@ -2687,7 +2695,7 @@
     <message>
         <location line="-416"/>
         <source>Target</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Цель</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -2722,22 +2730,22 @@
     <message>
         <location line="+15"/>
         <source>1 x 80 minute CD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">1 CD (80 мин)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>2 x 80 minute CD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">2 CD (80 мин)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>1 x 74 minute CD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">1 CD (74 мин)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>2 x 74 minute CD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">2 CD (74 мин)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2750,66 +2758,66 @@
         <location line="+27"/>
         <location line="+34"/>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мб</translation>
     </message>
     <message>
         <location line="-217"/>
         <source>Audio Bitrate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Битрейт Аудио</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Track 1:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дорожка 1:</translation>
     </message>
     <message>
         <location line="+14"/>
         <location line="+37"/>
         <location line="+232"/>
         <source>kbps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Кб/с</translation>
     </message>
     <message>
         <location line="-246"/>
         <source>Track 2:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дорожка 2:</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Результат</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Audio Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер аудио:</translation>
     </message>
     <message>
         <location line="+188"/>
         <source>Bits Per Pixel:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Биты на пиксель:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Video Bitrate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Битрейт видео:</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ОК</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отмена</translation>
     </message>
 </context>
 <context>
     <name>Cnr2Dialog</name>
     <message>
         <source>Narrow</source>
-        <translation type="obsolete">Стрелка </translation>
+        <translation type="obsolete">Стрелка</translation>
     </message>
     <message>
         <source>Sensibility</source>
@@ -2955,17 +2963,17 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+64"/>
         <source>Indexing</source>
-        <translation type="unfinished">Индектирование</translation>
+        <translation type="unfinished">Индексирование</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Time Left : Infinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Осталось времени : бесконечно</translation>
     </message>
     <message>
         <location line="+1"/>
         <source># Images :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"># изображений :</translation>
     </message>
 </context>
 <context>
@@ -2976,7 +2984,7 @@
         <location line="+41"/>
         <location line="+41"/>
         <source>Configure</source>
-        <translation type="unfinished">Настройка</translation>
+        <translation type="unfinished">&amp;Настройка</translation>
     </message>
     <message>
         <source>Audio Filters</source>
@@ -2988,17 +2996,17 @@
         <location line="+41"/>
         <location line="+41"/>
         <source>Filters</source>
-        <translation type="unfinished">Фильтры</translation>
+        <translation type="unfinished">&amp;Фильтры</translation>
     </message>
     <message>
         <location line="-164"/>
         <source>Audio Tracks Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка аудиодорожек</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Track 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Дорожка 1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -3006,22 +3014,22 @@
         <location line="+41"/>
         <location line="+41"/>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Включена</translation>
     </message>
     <message>
         <location line="-89"/>
         <source>Track 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Дорожка 2</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Track 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Дорожка 3</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Track 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Дорожка 4</translation>
     </message>
 </context>
 <context>
@@ -3049,22 +3057,22 @@
     <message>
         <location line="-76"/>
         <source>Calibrate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Калибровать</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Skip All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Пропустить все</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ОК</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Закрыть</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -3079,7 +3087,7 @@
     <message>
         <location line="+7"/>
         <source>Nb Lines :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">№ линий :</translation>
     </message>
 </context>
 <context>
@@ -3092,12 +3100,12 @@
     <message>
         <location line="+19"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отмена</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>TimeLeft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Осталось времени</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -3107,7 +3115,7 @@
     <message>
         <location line="+7"/>
         <source>ProcessImages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обработка изображений</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -3118,12 +3126,12 @@
     <message>
         <location line="+7"/>
         <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Скорость</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>0 fps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">0 к/с</translation>
     </message>
 </context>
 <context>
@@ -3131,12 +3139,12 @@
     <message>
         <location filename="../ADM_jobs/src/uiProgress.ui" line="+17"/>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Прогресс</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Current job</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Текущая операция</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -3147,12 +3155,12 @@
     <message>
         <location line="+7"/>
         <source>File being written </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Файл записывается</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">...</translation>
     </message>
 </context>
 <context>
@@ -3167,13 +3175,13 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
         <source>_Profile::</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Профиль:</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+9"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Битрейт</translation>
     </message>
     <message>
         <location line="-7"/>
@@ -3184,13 +3192,13 @@
         <location line="+1"/>
         <location line="+7"/>
         <source>After burner</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">После прожига</translation>
     </message>
     <message>
         <location line="-3"/>
         <location line="+5"/>
         <source>FDK-AAC Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка FDK-AAC</translation>
     </message>
 </context>
 <context>
@@ -3542,19 +3550,19 @@
         <translation type="obsolete">Сохранить проект как</translation>
     </message>
     <message>
-        <source>&amp;Zoom 1:4</source>
+        <source>Zoom 1:4</source>
         <translation type="obsolete">&amp;Размер 1:4</translation>
     </message>
     <message>
-        <source>Z&amp;oom 1:2</source>
+        <source>Zoom 1:2</source>
         <translation type="obsolete">Р&amp;азмер 1:2</translation>
     </message>
     <message>
-        <source>Zoom &amp;1:1</source>
+        <source>Zoom 1:1</source>
         <translation type="obsolete">Размер &amp;1:1</translation>
     </message>
     <message>
-        <source>Zoom &amp;2:1</source>
+        <source>Zoom 2:1</source>
         <translation type="obsolete">Размер &amp;2:1</translation>
     </message>
     <message>
@@ -3820,7 +3828,7 @@
     <message>
         <location line="+121"/>
         <source>&amp;Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Панели</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -3835,12 +3843,12 @@
     <message>
         <location line="+41"/>
         <source>Codec O&amp;ptions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">На&amp;стройки кодека</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Декодер видео&lt;b&gt;</translation>
     </message>
     <message>
         <location line="+75"/>
@@ -3851,43 +3859,43 @@
     <message>
         <location line="+57"/>
         <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Видео на выходе&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+176"/>
         <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Аудио на выходе&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>   (0 track(s))</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">   (0 дорожек)</translation>
     </message>
     <message>
         <location line="+161"/>
         <source>ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">мс</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Выходной формат&lt;b&gt;</translation>
     </message>
     <message>
         <location line="+114"/>
         <location line="+978"/>
         <source>&amp;Navigation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Навигация</translation>
     </message>
     <message>
         <location line="-903"/>
         <source>Play [SPACE]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Воспроизвести [SPACE]</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Play</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Воспроизвести</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3911,72 +3919,72 @@
     <message>
         <location line="-637"/>
         <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Остановить [SPACE]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to previous frame [LEFT]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предыдущий кадр [LEFT]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to next frame [RIGHT]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Следующий кадр [RIGHT]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to previous keyframe [DOWN]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предыдущий ключевой кадр [DOWN]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to next keyframe [UP]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Следующий ключевой кадр [UP]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Set start marker [CTRL+PAGEUP]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Установить маркер A [CTRL+PAGEUP]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Set end marker [CTRL+PAGEDOWN]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Установить маркер B [CTRL+PAGEDOWN]</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Search previous black frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предыдущий черный кадр</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Search next black frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Следующий черный кадр</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to first frame [HOME]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Первый кадр [HOME]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to last frame [END]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Последний кадр [END]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Backward one minute [CTRL+DOWN]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Назад на 1 минуту [CTRL+DOWN]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Forward one minute [CTRL+UP]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вперед на 1 минуту [CTRL+UP]</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Forward one minute</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вперед на 1 минуту</translation>
     </message>
     <message>
         <location line="+77"/>
@@ -3996,22 +4004,22 @@
     <message>
         <location line="+44"/>
         <source>Se&amp;lection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;lВыбор</translation>
     </message>
     <message>
         <location line="+73"/>
         <source>A:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">A:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>B:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">B:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Go to marker A [PAGE UP]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Перейти к маркеру A [PAGE UP]</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4022,32 +4030,32 @@
     <message>
         <location line="-3"/>
         <source>Go to Marker B [PAGE DOWN]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Перейти к маркеру B [PAGE DOWN]</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Display output video on playback</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отображать видео на выходе при воспроизведении</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Play filtered</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Включить фильтр</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Vol&amp;ume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Громкость</translation>
     </message>
     <message>
         <location line="+100"/>
         <source>Audio &amp;Metre</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Аудиометр</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Open Video</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Открыть видео</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -4062,7 +4070,7 @@
     <message>
         <location line="+38"/>
         <source>&amp;Codec Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Настройки кодека</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4077,7 +4085,7 @@
     <message>
         <location line="+11"/>
         <source>&amp;Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Выбор</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4087,7 +4095,7 @@
     <message>
         <location line="+11"/>
         <source>&amp;Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Громкость</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4097,7 +4105,7 @@
     <message>
         <location line="+11"/>
         <source>&amp;Audio Metre</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Аудиометр</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4270,17 +4278,17 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
         <source>Shell</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Командная строка</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Очистить</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Evaluate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выполнить</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4365,7 +4373,7 @@
     <message>
         <location line="+12"/>
         <source>Select VS file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать файл VS</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -4375,7 +4383,7 @@
     <message>
         <location line="+7"/>
         <source>Run!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Запуск!</translation>
     </message>
 </context>
 <context>
@@ -4459,7 +4467,7 @@
     <message>
         <location line="+36"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Лицензия</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -4877,12 +4885,12 @@
     <message>
         <location line="+6"/>
         <source>5 channels</source>
-        <translation type="unfinished">5 каналов  </translation>
+        <translation type="unfinished">5 каналов</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Automatic (max -3 dB)</source>
-        <translation type="unfinished">Авто (макс. -3 dB)</translation>
+        <translation type="unfinished">Авто (макс. -3 дБ)</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -4902,7 +4910,7 @@
     <message>
         <location line="+13"/>
         <source>Audio Filters</source>
-        <translation type="unfinished">Звуковые фильтры</translation>
+        <translation type="unfinished">Фильтры аудио</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+96"/>
@@ -4971,7 +4979,7 @@
     <message>
         <location line="+4"/>
         <source>File error</source>
-        <translation type="unfinished">Файловая ошибка</translation>
+        <translation type="unfinished">Ошибка файла</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -5205,7 +5213,7 @@
     <message>
         <location line="+0"/>
         <source>File %s was NOT saved correctly.</source>
-        <translation type="unfinished">Файл &quot;%s&quot; сохранен не корректно.</translation>
+        <translation type="unfinished">Файл &quot;%s&quot; сохранен некорректно.</translation>
     </message>
     <message>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+47"/>
@@ -5259,7 +5267,7 @@
     </message>
     <message>
         <source>_Quantizer:</source>
-        <translation type="obsolete">Квантователь:</translation>
+        <translation type="obsolete">_Квантизатор:</translation>
     </message>
     <message>
         <source>Bit_rate mode:</source>
@@ -5352,32 +5360,32 @@
     <message>
         <location line="-28"/>
         <source>Film to PAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Из Film в PAL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PAL to Film</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Из PAL в Film</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Stereo+surround</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Стерео + объемный звук</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo+center</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Стерео + центр</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo+center+surround</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Стерео + центр + объемный звук</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo front+stereo rear</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Стерео (передний) + стерео (задний)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5403,32 +5411,32 @@
     <message>
         <location line="+5"/>
         <source>Manual (dB)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вручную (дБ)</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Remix:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ремикс:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Mixer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Микшер</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Shift audio:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сдвиг аудио:</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Shift Value (ms):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Значение сдвига (мс):</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-20"/>
         <source>Fontconfig</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка шрифта</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5474,7 +5482,7 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="-3"/>
         <source>TimeStamp:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Временная метка:</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="-3"/>
@@ -5484,107 +5492,107 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-23"/>
         <source>Audio Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Плагины аудио</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Video Encoder Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Плагины видеокодеков</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Video Encoder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Видеокодек</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Video Decoder Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Плагины декодеров видео</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Video Decoder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Декодер видео</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Audio Device Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Плагины аудиоустройств</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Audio Device</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Аудиоустройство</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Audio Encoder Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Плагины аудиокодеков</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Audio Encoders</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Аудиокодеки</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Demuxer Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Плагины демультиплексоров</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Demuxers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Демультиплексоры</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Muxer Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Плагины мультиплексоров</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Muxers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мультиплексоры</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plugins Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Информация о плагинах</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+12"/>
         <source>_Deringing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Дерингинг</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-263"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Декодировать видео с помощью VDPAU (NVIDIA)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Decode video using XVBA (AMD)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Декодировать видео с помощью XVBA (AMD)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Decode video using LIBVA (INTEL)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Декодировать видео с помощью LIBVA (INTEL)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable openGl support</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Включить поддержку OpenGL</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">При включении аппаратного ускорения лучше использовать подходящий видеодрайвер</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>_Check for new release</source>
-        <translation>_Проверять на обновления</translation>
+        <translation>_Проверять обновления</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -5594,28 +5602,28 @@
     <message>
         <location line="+52"/>
         <source>_Split MPEG files every (MB):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Разделять файлы MPEG через каждые (Мб)</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>VDPAU (best)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">VDPAU (лучшее)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>OpenGL (best)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">OpenGL (лучшее)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>LIBVA (best)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">LIBVA (лучшее)</translation>
     </message>
     <message>
         <location line="+28"/>
         <location line="+3"/>
         <source>Sdl driver</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Драйвер SDL</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -5636,12 +5644,12 @@
     <message>
         <location line="+16"/>
         <source>_AudioDevice</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Аудиоустройство</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>De_ringing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Дерингинг</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5661,12 +5669,12 @@
     <message>
         <location line="+34"/>
         <source>_Limit Refresh Rate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Ограничение частоты обновлений</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Refresh Rate Cap (ms)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Интервал частоты обновлений (мс)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5676,22 +5684,22 @@
     <message>
         <location line="+16"/>
         <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Монитор</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>HW Accel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Аппаратное ускорение</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>_Always ask which port to use</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Всегда выбирать порт</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Default port to use</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Порт по умолчанию</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-77"/>
@@ -5755,12 +5763,12 @@
     <message>
         <location line="+6"/>
         <source>Undo</source>
-        <translation type="unfinished">Отменить шаг</translation>
+        <translation type="unfinished">Отменить</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Redo</source>
-        <translation>Повторить шаг</translation>
+        <translation>Повторить</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5785,7 +5793,7 @@
     <message>
         <location line="+7"/>
         <source>Save current settings as default</source>
-        <translation>Сделать текущие настройки вывода настройками по умолчанию</translation>
+        <translation>Сохранить текущие настройки вывода по умолчанию</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5795,247 +5803,253 @@
     <message>
         <location line="+6"/>
         <source>Decoder Option</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройки декодера</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PostProcessing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Постпроцессинг</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Select Track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать дорожку...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save audio</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить аудио...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Build Option</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Опции сборки...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Плагины...</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Дополнительно</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open Application &amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Открыть журнал приложения</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open Application Data &amp;Folder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">О&amp;ткрыть папку с данными приложения</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>About</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">О программе...</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Previous Frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предыдущий кадр</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next Frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Следующий кадр</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>First Frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Первый кадр</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Last Frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Последний кадр</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Go To Marker A</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Перейти к маркеру A</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Go To Marker B</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Перейти к маркеру B</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Go To Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Перейти ко времени...</translation>
     </message>
     <message>
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
         <location line="+42"/>
         <source>You cannot remove *all* the video
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нельзя удалить все видео</translation>
     </message>
     <message>
         <location filename="../../common/ADM_editor/src/utils/ADM_edFrameType.cpp" line="+72"/>
         <source>Updating frametype</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обновление тип фрейма</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+0"/>
         <source>Core has been compiled without LIBVA support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ядро было скомпилировано без поддержки LLBVA, но приложение - с ее поддержкой.
+Ошибка установки</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+0"/>
         <source>Core has been compiled without VDPAU support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ядро было скомпилировано без поддержки VDPAU, но приложение - с ее поддержкой.
+Ошибка установки</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+0"/>
         <source>Core has been compiled without XVBA support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ядро было скомпилировано без поддержки XVBA, но приложение - с ее поддержкой.
+Ошибка установки</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-144"/>
         <source>No audio track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нет звуковой дорожки</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>An audio track is necessary to create such file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Для создания файла данного типа требуется аудиодорожка</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Cannot select the MPEG-4 SP codec.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно выбрать кодек MPEG-4 SP.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>No AAC audio encoder plugin found.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Не найден плагин аудиокодека AAC.</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>The MP3 codec does not allow disabling reservoir.
 Install lame plugin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Кодек MP3 не позволяет отключение источника.
+Установите плагин LAME</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>You don&apos;t have LAME!.
 It is needed to create FLV  video.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">У вас не установлен плагин LAME!
+Он требуется для создания видео FLV.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Cannot select FLV1  codec.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно выбрать кодек FLV1</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Cannot select MPEG-4 SP codec.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно выбрать кодек MPEG-4 SP</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>You don&apos;t have FAAC!.
 It is needed to create PSP compatible video.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">У вас не установлен плагин FAAC!
+Он требуется для создания видео, совместимого с PSP.</translation>
     </message>
     <message>
         <location filename="../../common/gui_main.cpp" line="-1187"/>
         <source>Select script/project to run</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать скрипт/проект для запуска</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Select script to run</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать скрипт для запуска</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Select script to debug</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать скрипт для отладки</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Select script to save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать скрипт для сохранения</translation>
     </message>
     <message>
         <location line="+161"/>
         <location line="+65"/>
         <source>Select Video File...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать файл видео...</translation>
     </message>
     <message>
         <location line="-40"/>
         <source>No engine</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нет движка</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>tinyPy script is not enabled in this build</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Скрипт tinyPy не включен в эту сборку</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>Select Video File to Append...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать файл видео для присоединения...</translation>
     </message>
     <message>
         <location line="+196"/>
         <source>Cutting</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обрезка</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Error while cutting out.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ошибка обрезки</translation>
     </message>
     <message>
         <location line="+641"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Неверный индекс аудио</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Cannot use that file as audio track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно использовать файл для аудиодорожки</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Файл аудио не найден в списке, хотя он должен был там быть. Создайте отчет об ошибке!</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Unable to set the audio language: No video loaded yet!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно установить язык аудио: видео не загружено</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Установка языка дорожки невозможна: в видео нет файла аудио!</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Setting the language for the given track index is not possible: Invalid track index!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Установка языка дорожки невозможна: неверный индекс дорожки!</translation>
     </message>
     <message>
         <location line="+134"/>
@@ -6055,7 +6069,7 @@
     <message>
         <location line="+0"/>
         <source>This function is disabled or no longer valid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Функция отключена или более недействительна</translation>
     </message>
     <message>
         <location filename="../../common/gui_play.cpp" line="+411"/>
@@ -6070,43 +6084,43 @@
     <message>
         <location line="+0"/>
         <source>No file loaded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Файл не загружен</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Job</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Операция</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot reach database. Do you have Job control running ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно подключиться к базе данных. У вас включено управление операциями?</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Output file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выходной файл</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Job name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Название операции</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Queue job to jobList</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Добавить операцию в очередь</translation>
     </message>
     <message>
         <location line="+208"/>
         <source>Function not implemented
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Функция не включена</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Cannot create stream</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно создать поток</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -6121,67 +6135,71 @@
     <message>
         <location line="+0"/>
         <source>Fail to save as jpeg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Не удалось сохранить в JPEG</translation>
     </message>
     <message>
         <location line="+104"/>
         <source>Cannot get tinyPÿ script engine</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно запустить движок скрипта tinyPy</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Cannot add job %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно добавить операцию %s</translation>
     </message>
     <message>
         <location filename="../../common/gui_savenew.cpp" line="-174"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Использовать предыдущие данные прохода еще раз?
+Предупреждение: настройки могут быть закрыты.</translation>
     </message>
     <message>
         <location line="+138"/>
         <source>Cannot instantiate video chain</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно подтвердить цепочку видео</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+24"/>
         <source>Cannot create encoder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно создать декодер</translation>
     </message>
     <message>
         <location line="-8"/>
         <source>Cannot setup codec. Bitrate too low?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно установить кодек. Слишком низкий битрейт?</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно настроить аудиокодек, убедитесь в совместимости потока с ним (количество каналов, битрейт, формат)</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>The video is in copy mode but the cut points are not on keyframes.
 The video will be saved but there will be corruption at cut point(s).
 Do you want to continue anyway ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Установлен режим копирования для видео, но точки обрезки находятся не на ключевых кадрах.
+Видео будет сохранено, но в месте точек обрезки возможны повреждения.
+Вы все равно хотите продолжить?
+        </translation>
     </message>
     <message>
         <location line="+11"/>
         <location line="+26"/>
         <source>Muxer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мультиплексор</translation>
     </message>
     <message>
         <location line="-26"/>
         <source>Cannot instantiate muxer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно подтвердить мультиплексор</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Cannot open </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно открыть </translation>
     </message>
     <message>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
@@ -6196,77 +6214,77 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-23"/>
         <source>_Interlaced</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Режим интерлейсинга</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ca_rtoon mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Р_ежим анимации</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Greyscale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Оттенки серого</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Turbo mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Турборежим</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C_hroma optimizer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Оптимизатор цвета</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Main</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Главный</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Very Low</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Очень низкий</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Very High</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Очень высокий</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ultra High</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ультравысокий</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Motion Search Precision</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Точность поиска движений</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Off</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выключено</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Mode Decision</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Точность режима</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>VHQ Mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Режим VHQ</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Max B Frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимум кадров B</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quarter Pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Четверть пикселя</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6281,7 +6299,7 @@
     <message>
         <location line="+1"/>
         <source>Advanced Simple Profile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительный простой профиль</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -6301,27 +6319,27 @@
     <message>
         <location line="+1"/>
         <source>More Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дальнейший поиск</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Min Gop Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Минимальный размер GOP</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Gop Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный размер GOP</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GOP Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер GOP</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Motion</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Движение</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6336,97 +6354,97 @@
     <message>
         <location line="+1"/>
         <source>Quantization Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Матрица квантизации</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Trellis Quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация Треллиса</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Two Pass Tuning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка двух проходов</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Key Frame Boost(%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ускорение ключевых кадров (%)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>I-frames closer than...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Кадры I ближе, чем...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>.. are reduced by(%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">... уменьшены на (%)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Overflow Improvement(%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальное увеличение переполнения (%)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Overglow Degradation(%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальное уменьшение переполнения (%)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Curve Compression</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сжатие кривых</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>High Bitrate Scenes (%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сцены с высоким битрейтом (%)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Bitrate Scenes (%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сцены с низким битрейтом (%)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Overflow Control Strength</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Степень управления переполнением</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Two Pass</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">2 прохода</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Xvid4 Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка Xvid4</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="+23"/>
         <source>%d minute(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%d мин</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>%d hour(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%d ч</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Less than a minute</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Меньше минуты</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>A few seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Несколько секунд</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-1"/>
@@ -6521,17 +6539,17 @@
     <message>
         <location line="+1"/>
         <source>8-bit PCM</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">8-битный PCM</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unknown codec</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Неизвестный кодек</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
         <source>Building time map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Создание временной карты</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
@@ -6541,17 +6559,17 @@
     <message>
         <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
         <source>Saving</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранение</translation>
     </message>
     <message>
         <location line="+132"/>
         <source>Too short</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Слишком коротко</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>The video has been saved but seems to be incomplete.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Видео сохранено, но возможно, что оно неполное.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
@@ -6564,44 +6582,48 @@
         <source>can&apos;t open &quot;%s&quot;: %s
 %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">невозможно открыть &quot;%s&quot;: %s
+%s</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+85"/>
         <source>filesystem full</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">файловая система переполнена</translation>
     </message>
     <message>
         <location line="-85"/>
         <location line="+85"/>
         <source>quota exceeded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">превышена квота</translation>
     </message>
     <message>
         <location line="-84"/>
         <location line="+85"/>
         <source>Please free up some space and press RETRY to try again.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Пожалуйста, освободите место и нажмите RETRY, чтобы попробовать заново.</translation>
     </message>
     <message>
         <location line="-78"/>
         <source>can&apos;t open &quot;%s&quot;: %u (%s)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">невозможно открыть &quot;%s&quot;: %u (%s)
+</translation>
     </message>
     <message>
         <location line="+75"/>
         <source>can&apos;t write to file &quot;%s&quot;: %s
 %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">невозможно записать в файл &quot;%s&quot;: %s
+%s
+</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+11"/>
         <source>__unknown__</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">__неизвестно__</translation>
     </message>
     <message>
         <location line="-8"/>
@@ -6611,13 +6633,14 @@
     <message>
         <location line="+0"/>
         <source>Retry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Повторить</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>can&apos;t write to file &quot;%s&quot;: %u (%s)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">невозможно записать в файл &quot;%s&quot;: %u (%s)
+</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-7"/>
@@ -6652,23 +6675,24 @@
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
         <location line="+35"/>
         <source>Codec</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Кодек</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
         <source>Internal error finding codec 0x%x</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внутренняя ошибка поиска кодека 0x%x</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Internal error opening 0x%x</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внутренняя ошибка открытия 0x%x</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+0"/>
         <source>Core has been compiled without DXVA2 support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ядро было скомпилировано без поддержки DXVA2, а приложение - с его поддержкой.
+Ошибка установки</translation>
     </message>
 </context>
 <context>
@@ -6681,7 +6705,7 @@
     <message>
         <location line="+6"/>
         <source>Aften Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка Aften</translation>
     </message>
 </context>
 <context>
@@ -6689,18 +6713,19 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+158"/>
         <source>File Error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ошибка файла.</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot open file
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно открыть файл
+</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp" line="+471"/>
         <source>Indexing</source>
-        <translation type="unfinished">Индектирование</translation>
+        <translation type="unfinished">Индексирование</translation>
     </message>
 </context>
 <context>
@@ -6713,17 +6738,17 @@
     <message>
         <location line="+1"/>
         <source>Adaptative sharpener by MarcFD.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Адаптивный инструмент резкости от MarcFD</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.cpp" line="+107"/>
         <source>Original</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Оригинальный</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Processed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обработанный</translation>
     </message>
 </context>
 <context>
@@ -6751,7 +6776,7 @@
     <message>
         <location line="+117"/>
         <source>Unknown flag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Неизвестный флаг</translation>
     </message>
 </context>
 <context>
@@ -6769,7 +6794,7 @@
     <message>
         <location line="+1"/>
         <source>_Line spacing:</source>
-        <translation type="unfinished">Межстрочный интервал:</translation>
+        <translation type="unfinished">Междустрочный интервал:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6800,22 +6825,22 @@
     <message>
         <location line="+1"/>
         <source>Hardcode ass/ssa/srt subtitles using libass.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Встроенные файлы субтитров ASS/SSA/SRT с использованием libass.</translation>
     </message>
     <message>
         <location line="+62"/>
         <source>Format ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Формат?</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Are you sure this is an ass file ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вы уверены, что это файл ASS?</translation>
     </message>
     <message>
         <location line="+56"/>
         <source>This is a srt file. Convert to SSA ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Это файл SRT. Конвертировать в SSA?</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -6827,38 +6852,39 @@
     <message>
         <location line="-13"/>
         <source>Cannot load this srt file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно загрузить файл SRT.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cannot convert to ssa.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно конвертировать в SSA.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Cannot save converted file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно сохранить конвертированный файл.</translation>
     </message>
     <message>
         <location line="+55"/>
         <source>Fonts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Шрифты</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Preparing the fonts can take a few minutes the first time.
 This message will not be displayed again.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">В первый раз подготовка шрифтов может занять несколько минут.
+Это сообщение больше показываться не будет.</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>SSA Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ошибка SSA</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot read_file for *%s*</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно прочитать файл для *%s*</translation>
     </message>
 </context>
 <context>
@@ -6873,13 +6899,14 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
         <source>Bad Idea</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Плохая идея</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Using H264/H265 in AVI is a bad idea, MKV is better for that.
  Do you want to continue anyway ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Использование H264/H265 в AVI — плохая идея, лучше выбрать MKV.
+ Вы все равно хотите продолжить?</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -6889,12 +6916,12 @@
     <message>
         <location line="+0"/>
         <source>Cannot create AVI file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно создать AVI файл</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
         <source>Muxing Format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Формат мультиплексирования</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6907,42 +6934,42 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="+598"/>
         <source>_wine app file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Файл приложения wine</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select wine filename[wine/cedega/etc.]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выберите файл wine [wine/cedega/т.п.]</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_loader file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ф_айл загрузчика</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select loader filename[avsload.exe]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выберите файл загрузчика[avsload.exe]</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_avs file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фа_йл avs</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select avs filename[*.avs]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выберите файл avs [*.avs]</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_pipe timeout:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Таймаут в pipe:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>AvsFilter config</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка AvsFilter</translation>
     </message>
 </context>
 <context>
@@ -6955,27 +6982,27 @@
     <message>
         <location line="+1"/>
         <source>Constant Quantiser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Постоянный квантизатор</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Same Quantiser as Input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Такой же квантизатор, как и на входе</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Constant Rate Factor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фактор постоянной частоты</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two Pass - Video Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">2 прохода - размер видео</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two Pass - Average Bitrate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">2 прохода - средний битрейт</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6990,13 +7017,13 @@
     <message>
         <location line="+86"/>
         <source>Target bitrate (kb/s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Целевой битрейт (кб/с)</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+19"/>
         <source>Quantizer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизатор</translation>
     </message>
     <message>
         <location line="-14"/>
@@ -7019,27 +7046,27 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="+48"/>
         <source>Black</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Черный</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Replace a section by black.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Заменить отрезок черным.</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>_Start time (ms):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Время начала (мс):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_End time (ms):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">В_ремя начала (мс):</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Replace by Black</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Заменить черным</translation>
     </message>
 </context>
 <context>
@@ -7122,17 +7149,17 @@
     <message>
         <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Черный кадр</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">В данный момент эта функция не поддерживается</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Searching black frame..</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Поиск черного кадра...</translation>
     </message>
 </context>
 <context>
@@ -7182,37 +7209,37 @@
     <message>
         <location line="+31"/>
         <source>Change FPS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Изменить кадры/c</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ускорение/замедление видео при изменении кадров/c. Этот фильтр изменяет продолжительность видео.</translation>
     </message>
     <message>
         <location line="+131"/>
         <source>Source Fps:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Кадры/с источника:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Source frame rate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Частота кадров источника:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Destination Fps:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Кадры/с приемника:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Destination frame rate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Частота кадров приемника:</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Change fps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Изменить кадры/с</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -7222,7 +7249,7 @@
     <message>
         <location line="+0"/>
         <source>Invalid fps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Неверные кадры/с</translation>
     </message>
 </context>
 <context>
@@ -7248,12 +7275,12 @@
     <message>
         <location line="+24"/>
         <source>V Shift</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сдвиг V</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>U Shift</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сдвиг U</translation>
     </message>
 </context>
 <context>
@@ -7266,27 +7293,27 @@
     <message>
         <location line="-16"/>
         <source>Avisynth color filter.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Цветофильтр Avisynth</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Color management filter.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фильтр управления цветом.</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>AutoWhite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Автоматически белый</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>AutoGain</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Автоусиление</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Clip to Tv Range (16-235)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обрезать до диапазона ТВ (16-235)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -7301,62 +7328,62 @@
     <message>
         <location line="+2"/>
         <source>Levels:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Уровни:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Y gain</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Усиление Y</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Y Brightness</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Яркость Y</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Y Gamma</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Гамма Y</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Y Contrast</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Контраст Y</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>U gain</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Усиление U</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>U Brightness</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Яркость U</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>U Contrast</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Контраст U</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>V gain</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Усиление V</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>V Brightness</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Яркость V</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>V Contrast</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Контраст V</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Flags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Флаги</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7436,12 +7463,12 @@
     <message>
         <location line="-1"/>
         <source>Process luma plane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обработать уровень luma</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Fast Convolution</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Быстрая свертка</translation>
     </message>
 </context>
 <context>
@@ -7471,24 +7498,26 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
         <source>crop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">обрезать</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>crop filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">фильтр обрезки</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предупреждение: ширина слишком сильно обрезана! Ее значение восстановлено!
+</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Warning Cropping too much height ! Height reseted !
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предупреждение: высота слишком сильно обрезана! Ее значение восстановлено!
+</translation>
     </message>
 </context>
 <context>
@@ -7511,22 +7540,22 @@
     <message>
         <location line="-108"/>
         <source>Right:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Справа:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Top:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сверху:</translation>
     </message>
     <message>
         <location line="+64"/>
         <source>Bottom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Слева:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Left:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Снизу:</translation>
     </message>
 </context>
 <context>
@@ -7539,7 +7568,7 @@
     <message>
         <location line="+6"/>
         <source>DcaEnc Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка DcaEnc</translation>
     </message>
 </context>
 <context>
@@ -7547,26 +7576,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+75"/>
         <source>Replace (interpolate)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished">Заменить (интерполировать)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Pulldown dupe removal</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished">Удаление Pulldown dupe</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Fastest (no chroma, partial luma)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished">Быстрый (нет chroma, частичная luma)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Medium (full luma, no chroma)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished">Быстрый (нет chroma, полная luma)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -7596,8 +7621,7 @@
     <message>
         <location line="+4"/>
         <source>Decomb Decimate</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-39"/>
@@ -7607,22 +7631,22 @@
     <message>
         <location line="+1"/>
         <source>Donald Graft decimate. Remove duplicate after telecide.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Donald Graft decimate. Удалите дубликат после telecide.</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Discard closer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отменить ближайшее</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Discard longer dupe (animés)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отменить долгий dupe (для аниме)</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Sho_w</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Показать</translation>
     </message>
 </context>
 <context>
@@ -7634,7 +7658,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Blend a logo by interpolating its surrounding box.</source>
+        <source>Прикрепить логотип с помощью интерполяции окружения.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7673,32 +7697,32 @@
     <message>
         <location line="+11"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сверху</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Снизу</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Keep nb of frames and fps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить количество кадров и кадров/с</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double nb of frames and fps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удвоить количество кадров и кадров/с</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double nb of frames (slow motion)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удвоить количество кадров (замедление)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>_Top Field First:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Сначала поле сверху</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -7727,7 +7751,7 @@
     <message>
         <location line="+1"/>
         <source>Null filter, it does nothing at all.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Никакой фильтр применяться не будет.</translation>
     </message>
 </context>
 <context>
@@ -7735,7 +7759,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
         <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">DV поддерживает только 720*576*25 кадров/с и 720*480*29.97 кадров/с</translation>
     </message>
 </context>
 <context>
@@ -7836,7 +7860,7 @@
     <message>
         <location line="-164"/>
         <source>Main</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Главный</translation>
     </message>
     <message>
         <location line="+48"/>
@@ -7883,7 +7907,7 @@
         <location line="+7"/>
         <location line="+17"/>
         <source>0 MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">0 Мб</translation>
     </message>
     <message>
         <location line="-10"/>
@@ -7920,7 +7944,7 @@
     <message>
         <location line="+10"/>
         <source>0 kB/s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">0 Кб/с</translation>
     </message>
     <message>
         <location line="+41"/>
@@ -7976,7 +8000,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+60"/>
         <source>Adjust contrast, brightness, saturation and gamma.</source>
-        <translation type="unfinished">Настройка контраста, яркости, насыщености и гаммы.</translation>
+        <translation type="unfinished">Настройка контраста, яркости, насыщенности и гаммы.</translation>
     </message>
     <message>
         <location line="-1"/>
@@ -8009,32 +8033,32 @@
     <message>
         <location line="-37"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Гамма&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+132"/>
         <source>Blue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Синий</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Красный</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Initial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Начальный</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вес</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Green</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Зеленый</translation>
     </message>
 </context>
 <context>
@@ -8047,7 +8071,7 @@
     <message>
         <location line="+6"/>
         <source>Faac Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка Faac</translation>
     </message>
 </context>
 <context>
@@ -8087,17 +8111,17 @@
     <message>
         <location line="-23"/>
         <source>Fade.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Затемнить.</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>_Start time (ms):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Начальное время (мс)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_End time (ms):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Конечное время (мс)</translation>
     </message>
 </context>
 <context>
@@ -8106,12 +8130,12 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
         <location line="+26"/>
         <source>Fade to black</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Затемнение до черного</translation>
     </message>
     <message>
         <location line="-25"/>
         <source>Fade to black in/out.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Затемнить до черного (появление/исчезание).</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -8121,32 +8145,32 @@
     <message>
         <location line="+0"/>
         <source>Fade out</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Исчезание</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>In</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ввод</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Fade in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Появление</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>_Fade type:</source>
-        <translation type="unfinished">Тип затемнения:</translation>
+        <translation type="unfinished">_Тип затемнения:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Start time (ms):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Начальное время (мс):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_End time (ms):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Конечное время (мс):</translation>
     </message>
 </context>
 <context>
@@ -8159,7 +8183,7 @@
     <message>
         <location line="+36"/>
         <source>Interlacing</source>
-        <translation type="unfinished">Черезстрочность</translation>
+        <translation type="unfinished">Череcстрочность</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -8169,17 +8193,17 @@
     <message>
         <location line="-86"/>
         <source>Normal (4:3)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нормальный (4:3)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Wide (16:9)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Широкий (16:9)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">По умолчанию</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8189,7 +8213,7 @@
     <message>
         <location line="+1"/>
         <source>Animes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Аниме</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8199,157 +8223,157 @@
     <message>
         <location line="+4"/>
         <source>MB comparison</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сравнение MB</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Fewest bits (vhq)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Несколько битов (vhq)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rate distortion</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Искажение частоты</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>One thread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Один поток</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two threads)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">2 потока</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Three threads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">3 потока</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Auto (#cpu)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Автоматически (#cpu)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Progressive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Прогрессивнный</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Interlaced</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Чересстрочный</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Top Field First</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сначала верхнее поле</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bottom Field First</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сначала нижнее поле</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Mi_n. quantizer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Мин. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ma_x. quantizer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">М_акс. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max. quantizer _difference:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Разница макс. квантизатора:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>VBV Buffer Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер буфера :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max bitrate (kb/s):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный битрейт (Кб/с)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Trellis quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация _Треллиса</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Number of B frames:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Количество кадров B:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>_Macroblock decision:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Определение макроблоков:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Aspect ratio:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Соотношение сторон:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Matrices:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Матрицы:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Допустимый размер файла (Кб)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quantizer compression:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Сжатие квантизации:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Размытие квантизации:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Gop Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Размер GOP:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Interlaced:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Чересстрочный:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Field Order:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Порядок поля:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Basic Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Основные настройки</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Adv. Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Доп. настройки</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>libavcodec MPEG-2 configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка libavcodec MPEG-2</translation>
     </message>
 </context>
 <context>
@@ -8382,12 +8406,12 @@
     <message>
         <location line="-76"/>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Полностью</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Журнал</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8417,57 +8441,57 @@
     <message>
         <location line="+4"/>
         <source>MB comparison</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сравнение Мб</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Fewest bits (vhq)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Несколько битов (vhq)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rate distortion</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Искажение темпа</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>One thread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Один поток</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two threads)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Два потока</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Three threads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Три потока</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Auto (#cpu)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Автоматически (#cpu)</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Matrices</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Матрицы</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Mi_n. quantizer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Мин. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ma_x. quantizer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">М_акс. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max. quantizer _difference:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Разница максимального квантизатора:</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -8477,12 +8501,12 @@
     <message>
         <location line="+1"/>
         <source>_Trellis quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация _Треллиса</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quarter pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Четверть пикселя</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8492,52 +8516,52 @@
     <message>
         <location line="+3"/>
         <source>_Number of B frames:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">К_оличество кадров B:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Quantization type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Тип квантизации:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Macroblock decision:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">О_пределение макроблоков:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Допустимый размер файла (Кб):</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quantizer compression:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ко_мпрессия квантизации:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Размытие квантизации:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Gop Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер GOP:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Advanced Simple Profile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительный простой профиль</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>libavcodec MPEG-4 configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка libavcodec MPEG-4</translation>
     </message>
 </context>
 <context>
@@ -8560,12 +8584,12 @@
     <message>
         <location line="-46"/>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Полностью</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Журнал</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8595,67 +8619,67 @@
     <message>
         <location line="+4"/>
         <source>MB comparison</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сравнение Мб</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Fewest bits (vhq)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Несколько битов (vhq)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rate distortion</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Искажение частоты</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Mi_n. quantizer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Мин. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ma_x. quantizer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">М_акс. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max. quantizer _difference:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Разница макс. квантизатора:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Trellis quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация _Треллиса:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Допустимый размер файла (Кб):</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quantizer compression:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Сжатие квантизатора:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Размытие квантизатора:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Gop Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Размер GOP:</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>libavcodec MPEG-4 configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка libavcodec MPEG-4</translation>
     </message>
 </context>
 <context>
@@ -8663,12 +8687,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
         <source>Low Quality</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Низкое качество</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>High Quality</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Высокое качество</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8678,37 +8702,37 @@
     <message>
         <location line="+1"/>
         <source>Low Latency</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Низкий отклик</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Latency (LQ)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Низкий отклик (низкое качество)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Latency (HQ)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Низкий отклик (высокое качество)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Preset:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предустановки:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Битрейт (Кб/с):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный битрейт (Кб/с):</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>libavcodec MPEG-4 configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка libavcodec MPEG-4</translation>
     </message>
 </context>
 <context>
@@ -8716,90 +8740,98 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+64"/>
         <source>[Mismatch]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">[Несовпадение]</translation>
     </message>
     <message>
         <location line="+76"/>
         <source>Saving mpeg PS (ff)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранение mpeg PS (ff)</translation>
     </message>
     <message>
         <location line="+45"/>
         <source> video not compatible
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> видео несовместимо
+</translation>
     </message>
     <message>
         <location line="+9"/>
         <source> Bad width/height for VCD
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Некорректная ширина/высота для VCD
+</translation>
     </message>
     <message>
         <location line="+6"/>
         <source> Bad width/height for SVCD
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Некорректная ширина/высота для SVCD
+</translation>
     </message>
     <message>
         <location line="+6"/>
         <source> Bad width/height for DVD
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Некорректная ширина/высота для DVD
+</translation>
     </message>
     <message>
         <location line="+17"/>
         <source> VCD : only MP2 audio accepted
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> VCD : подходит только аудио MP2
+</translation>
     </message>
     <message>
         <location line="+5"/>
         <source> VCD : only 44.1 khz audio accepted
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">VCD : подходит только аудио 44.1 кГц
+</translation>
     </message>
     <message>
         <location line="+7"/>
         <source> DVD : only 48 khz audio accepted
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">DVD : подходит только аудио 48 кГц
+</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>[ffPS] DVD : only MP2/AC3/DTS audio accepted
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">[ffPS] DVD : подходит только аудио MP2/AC3/DTS
+</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
         <source>Free</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Свободно</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Muxing Format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Формат мультиплексирования</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Allow non compliant stream</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Разрешать несвободный поток</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Total Muxrate (kbits)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Общая скорость мультиплексирования (Кбит/с)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Video Muxrate (kbits)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Скорость мультиплексирования видео (Кбит/с)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>VBV size (kBytes)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер VBV (Кб)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8817,17 +8849,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
         <source>Saving mpeg TS (ff)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранение mpeg TS (ff)</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSConfig.cpp" line="+28"/>
         <source>VBR muxing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мультиплексирование VBR</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Mux rate (MBits/s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Скорость мультиплексирования (Мбит/с)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -8852,7 +8884,9 @@
         <source>%s already exists.
 
 Do you want to replace it?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%s уже существует.
+
+Вы хотите его заменить?</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8911,7 +8945,7 @@
     <message>
         <location line="-55"/>
         <source>Spatio-temporal cleaner by Ross Thomas.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Пространственно-временная очистка от Ross Thomas</translation>
     </message>
 </context>
 <context>
@@ -8934,12 +8968,12 @@
     <message>
         <location line="-46"/>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Полностью</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Журнал</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8969,67 +9003,67 @@
     <message>
         <location line="+4"/>
         <source>MB comparison</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сравнение Мб</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Fewest bits (vhq)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Несколько бит (vhq)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rate distortion</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Искажение частоты</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Mi_n. quantizer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Мин. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ma_x. quantizer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">М_акс. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max. quantizer _difference:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Разница макс. квантизатора:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Trellis quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация _Треллиса</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Допустимый размер файла:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quantizer compression:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Сжатие квантизатора:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ра_змытие квантизатора:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Gop Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Размер GOP:</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>libavcodec FLV1 configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка libavcodec FLV1</translation>
     </message>
 </context>
 <context>
@@ -9037,13 +9071,14 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+405"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предупреждение</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This FLV file says it has no video.
 I will assume it has and try to continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">В данном файле FLV не обнаружено видео.
+Я посчитаю, что оно есть, и попытаюсь продолжить</translation>
     </message>
 </context>
 <context>
@@ -9058,17 +9093,17 @@
     <message>
         <location line="-16"/>
         <source>Only FLV1 &amp; VP6 supported for video</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Для видео поддерживается только FLV1 &amp; VP6</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Only AAC &amp; mpegaudio supported for audio</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Для аудио поддерживается только AAC &amp; mpegaudio</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Only 44.1, 22.050 and 11.025 kHz supported</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Поддерживается только 44.1, 22.050 и 11.025 кГц</translation>
     </message>
 </context>
 <context>
@@ -9076,12 +9111,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp" line="+26"/>
         <source>Gaussian convolution.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Гауссова свертка.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3x3 convolution filter :gaussian.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фильтр свертки 3x3 :gaussian.</translation>
     </message>
 </context>
 <context>
@@ -9089,12 +9124,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp" line="+61"/>
         <source>OpenGl ReadBack benchmark</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Тест считывания OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Check how fast readback is.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Проверьте скорость считывания.</translation>
     </message>
 </context>
 <context>
@@ -9102,12 +9137,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp" line="+68"/>
         <source>OpenGl Fragment Shader Sample</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Образец фрагментного шейдера OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a fragment shader.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Запустите фрагментный шейдер.</translation>
     </message>
 </context>
 <context>
@@ -9115,12 +9150,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp" line="+66"/>
         <source>OpenGl Fragment Shader Sample2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Образец 2 фрагментного шейдера OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a fragment shader.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Запустите фрагментный шейдер.</translation>
     </message>
 </context>
 <context>
@@ -9128,22 +9163,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="+66"/>
         <source>OpenGl Resize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Изменение размера OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Resize using openGl.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Изменение размера с помощью OpenGL.</translation>
     </message>
     <message>
         <location line="+150"/>
         <source>Width :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ширина :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Height :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Высота :</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9156,17 +9191,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="+57"/>
         <source>OpenGl Rotate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Поворот OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rotate image by a small amount.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Поворот изображения на небольшой угол.</translation>
     </message>
     <message>
         <location line="+120"/>
         <source>Angle (°):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Угол (°)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -9179,12 +9214,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp" line="+68"/>
         <source>OpenGl Fragment Shader Sample</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Образец фрагментного шейдера OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a fragment shader.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Запустите фрагментный шейдер.</translation>
     </message>
 </context>
 <context>
@@ -9192,17 +9227,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+60"/>
         <source>Shader Loader</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Загрузчик шейдеров</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run an external shader program.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Запустите внешнюю программу шейдеров.</translation>
     </message>
     <message>
         <location line="+164"/>
         <source>ShaderFile to load</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Файл шейдеров для загрузки</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -9215,12 +9250,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.cpp" line="+61"/>
         <source>OpenGl Smooth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сглаживание OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Smooth image while preserving edge.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сглаживание изображения с сохранением граней.</translation>
     </message>
 </context>
 <context>
@@ -9233,42 +9268,42 @@
     <message>
         <location line="+1"/>
         <source>VDPAU deinterlacer+resize, openGl version (faster).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Деинтерлейсер + изменение размера VDPAU, версия OpenGL (быстрее).</translation>
     </message>
     <message>
         <location line="+178"/>
         <source>Keep Top Field</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить поле сверху</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep Bottom Field</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить поле снизу</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double framerate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удвоить частоту кадров</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>_Resize:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Изменить размер:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Deint Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Режим деинтерлейсинга:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Width :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ширина :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Height :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Высота :</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9281,12 +9316,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp" line="+59"/>
         <source>OpenGl Vertex Shader</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вертексный шейдер OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a simple vertex shader.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Запустить простой вертексный шейдер.</translation>
     </message>
 </context>
 <context>
@@ -9294,12 +9329,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp" line="+59"/>
         <source>OpenGl wave </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Волна OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Simple wave filter.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Простой волновой фильтр.</translation>
     </message>
 </context>
 <context>
@@ -9307,12 +9342,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp" line="+266"/>
         <source>Bottom field first</source>
-        <translation type="unfinished">Нижнее поле первое</translation>
+        <translation type="unfinished">Сначала нижнее поле</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Top field first</source>
-        <translation type="unfinished">Верхнее поле первое</translation>
+        <translation type="unfinished">Сначала верхнее поле</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -9332,27 +9367,27 @@
     <message>
         <location line="+1"/>
         <source>Yet another deinterlacer, using shaders.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Еще один деинтерлейсер, с использованием шейдеров.</translation>
     </message>
     <message>
         <location line="+182"/>
         <source>Temporal &amp; spatial check</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Временная &amp; пространственная проверка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bob, temporal &amp; spatial check</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bob, временная &amp; пространственная проверка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Skip spatial temporal check</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Пропустить временную &amp; пространственную проверку</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bob, skip spatial temporal check</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bob, пропустить временную &amp; пространственную проверку</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -9365,12 +9400,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp" line="+44"/>
         <source>Horizontal Flip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Горизонтальное отражение</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Horizontally flip the image.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Горизонтально отразить изображение</translation>
     </message>
 </context>
 <context>
@@ -9427,17 +9462,17 @@
     <message>
         <location line="-1"/>
         <source>Mplayer Hue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Оттенок (hue) Mplayer</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/DIA_flyHue.cpp" line="+61"/>
         <source>Original</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Оригинальный</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Processed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обработанный</translation>
     </message>
 </context>
 <context>
@@ -9469,12 +9504,12 @@
     <message>
         <location line="+9"/>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Тип:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>HuffYUV Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка HuffYUV</translation>
     </message>
 </context>
 <context>
@@ -9482,12 +9517,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp" line="+52"/>
         <source>Horizontal Stack Fields</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Горизонтальные стековые поля</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Put fields side by side.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Установить поля рядом.</translation>
     </message>
 </context>
 <context>
@@ -9495,22 +9530,22 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
         <source>Continue indexing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Продолжить индексирование</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Abort Requested</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Запрос на прерывание</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Do you want to abort indexing ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вы хотите прервать индексирование ?</translation>
     </message>
     <message>
         <location line="+76"/>
         <source>Time Left :%02d:%02d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Осталось времени :%02d:%02d:%02d</translation>
     </message>
 </context>
 <context>
@@ -9518,12 +9553,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
         <source>Remove IVTC dupe.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить IVTC dupe.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove the duplicate frames present after ivtc.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить удвоенные кадры после ivtc.</translation>
     </message>
     <message>
         <location line="+296"/>
@@ -9533,12 +9568,12 @@
     <message>
         <location line="+1"/>
         <source>_Show:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Показать:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Полностью</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9548,7 +9583,7 @@
     <message>
         <location line="+1"/>
         <source>VeryFast</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Очень быстро</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -9581,42 +9616,42 @@
     <message>
         <location filename="../ADM_jobs/src/uiJobs.ui" line="+17"/>
         <source>Avidemux Jobs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Операции Avidemux</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Run all pending jobs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Запустить все запланированные операции</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Run jobs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Запустить операции</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Delete already executed jobs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить уже выполненные операции</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Cleanup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Очистить</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>If you use VDPAU you cannot use CLI version</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно использовать версию CLI вместе с VDPAU</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>use QT4 version</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">использовать версию QT4</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выйти</translation>
     </message>
 </context>
 <context>
@@ -9634,17 +9669,17 @@
     <message>
         <location line="-7"/>
         <source>Delete Sel. Job</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить выбранное задание</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Run All Jobs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Запустить все задания</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Run Selected Job</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Запустить выбранное задание</translation>
     </message>
 </context>
 <context>
@@ -9667,7 +9702,7 @@
     </message>
     <message>
         <source>Running</source>
-        <translation type="obsolete">Исполняется</translation>
+        <translation type="obsolete">Выполняется</translation>
     </message>
     <message>
         <source>Job Name</source>
@@ -9715,7 +9750,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
         <source>_Quantizer:</source>
-        <translation type="unfinished">Квантователь:</translation>
+        <translation type="unfinished">_Квантизатор:</translation>
     </message>
     <message>
         <location line="-12"/>
@@ -9730,12 +9765,12 @@
     <message>
         <location line="+12"/>
         <source>_ColorSpace:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Цвет пространства:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Mjpeg Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка Mjpeg</translation>
     </message>
 </context>
 <context>
@@ -9817,7 +9852,7 @@
     <message>
         <location line="+0"/>
         <source>Show interlaced areas (for test!)</source>
-        <translation type="unfinished">Показать области чрезстрочности (для тестирования!)</translation>
+        <translation type="unfinished">Показать области чересстрочности (для тестирования!)</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9827,27 +9862,27 @@
     <message>
         <location line="-28"/>
         <source>Kernel Deint.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Корневой деинтерлейсинг</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Port of Donald Graft Kernel Deinterlacer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Порт деинтерлейсера от Donald Graft.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сверху</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Снизу</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>T_woway</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Два прохода</translation>
     </message>
 </context>
 <context>
@@ -9885,7 +9920,7 @@
     <message>
         <location line="+25"/>
         <source>_Disable reservoir:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Отключить источник:</translation>
     </message>
 </context>
 <context>
@@ -9914,22 +9949,22 @@
     <message>
         <location line="-36"/>
         <source>Large Median (5x5).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Большая медиана (5x5).</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Median filter on 5x5 matrix.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фильтр медианы на матрице on 5x5.</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Process luma plane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обработать luma plane</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Fast Convolution</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Быстрая свертка</translation>
     </message>
 </context>
 <context>
@@ -10036,22 +10071,22 @@
     <message>
         <location line="-131"/>
         <source>Libavdec Deinterlacers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Деинтерлейсеры Libavdec</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Lavcodec deinterlacer family.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Семейство деинтерлейсеров Lavcodec.</translation>
     </message>
     <message>
         <location line="+117"/>
         <source>Linear blend</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Линейная смесь</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>FFmpeg deint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Деинтерлейсинг FFmpeg</translation>
     </message>
 </context>
 <context>
@@ -10092,17 +10127,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="+22"/>
         <source>Add logo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Добавить логотип</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Put a logo on top of video, with alpha blending.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Добавить на видео логотип с альфа-наложением.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
         <source>Select Logo Image</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать изображение для логотипа</translation>
     </message>
 </context>
 <context>
@@ -10110,17 +10145,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui" line="+14"/>
         <source>Logo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Логотип</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Изображение</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Select</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -10135,16 +10170,16 @@
     <message>
         <location line="+33"/>
         <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Альфа-канал будет пропущен, если он уже есть в изображении (png в RGB)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alpha</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Альфа</translation>
     </message>
     <message>
         <location line="+45"/>
-        <source>You can click in the image to set the logo approximatively</source>
+        <source>Щелкните на изображение для установки логотипа</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10158,7 +10193,7 @@
     <message>
         <location line="+1"/>
         <source>Remove color, only key grey image.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удаляет все цвета, на выходе только оттенки серого.</translation>
     </message>
 </context>
 <context>
@@ -10188,7 +10223,7 @@
     <message>
         <location line="+9"/>
         <source>Interlacing</source>
-        <translation type="unfinished">Черезстрочность</translation>
+        <translation type="unfinished">Чересстрочность</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -10227,22 +10262,22 @@
     <message>
         <location line="-244"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;big&gt;&lt;b&gt;Активные фильтры&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
         <location line="+78"/>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;big&gt;&lt;b&gt;Доступные фильтры&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
         <location line="+95"/>
         <source>OpenGl</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">OpenGL</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>&amp;Preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Предпросмотр</translation>
     </message>
 </context>
 <context>
@@ -10293,12 +10328,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Изображения Matroska</translation>
     </message>
     <message>
         <location line="+425"/>
         <source>Matroska clusters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Кластеры Matroska</translation>
     </message>
 </context>
 <context>
@@ -10346,7 +10381,7 @@
     <message>
         <location line="+46"/>
         <source>Bottom :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Снизу :</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10359,12 +10394,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp" line="+27"/>
         <source>Mean convolution.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Средняя свертка.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3x3 convolution filter :mean.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фильтр свертки 3x3 :mean.</translation>
     </message>
 </context>
 <context>
@@ -10372,12 +10407,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="+28"/>
         <source>Median convolution.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Медианная свертка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3x3 convolution filter :median.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фильтр свертки 3x3 :median.</translation>
     </message>
 </context>
 <context>
@@ -10385,12 +10420,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp" line="+52"/>
         <source>Merge Fields</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Объединить поля</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Merge two pictures as if they were two fields.</source>
-        <translation type="unfinished">Поглощает две картинки как если они из двух полей            </translation>
+        <translation type="unfinished">Объединяет две картинки, как будто они из двух полей.</translation>
     </message>
 </context>
 <context>
@@ -10398,17 +10433,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
         <source>Saving Mkv</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранение в MKV</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
         <source>Force display width</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Принудительная ширина монитора</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display width</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ширина монитора</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -10426,23 +10461,23 @@
     <message>
         <location line="+1"/>
         <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Уменьшение шума, сглаживание изображения, увеличение сжатия. Версия в высоком качестве.</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>_Spatial luma strength:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Пространственная сила luma:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>S_patial chroma strength:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">П_ространственная сила chroma:</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+1"/>
         <source>Luma _Temporal strength:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Временная сила luma:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -10470,12 +10505,12 @@
     <message>
         <location line="+33"/>
         <source>_Spatial luma strength:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Пространственная сила luma:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>S_patial chroma strength:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">П_ространственная сила chroma:</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -10494,7 +10529,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нет таблицы stts</translation>
     </message>
 </context>
 <context>
@@ -10508,32 +10543,32 @@
     <message>
         <location line="-9"/>
         <source>Only MP4Video, H264, and H265 supported for video</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Для видео поддерживаются только MP4Video, H264 и H265</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Only AAC, AC3, and mpegaudio supported for audio</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Для аудио поддерживаются только AAC, AC3 и mpegaudio</translation>
     </message>
     <message>
         <location line="+79"/>
         <source>Saving mp4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранение в MP4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Saving PSP</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранение в формате PSP</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
         <source>Muxing Format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Формат мультиплексирования</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Use alternate MP3 tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Использовать альтернативные тэги для MP3</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -10546,17 +10581,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
         <source>Audio</source>
-        <translation type="unfinished">Звук</translation>
+        <translation type="unfinished">Аудио</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Audio format not supported, only AAC/MP3/AC3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Формат аудио не поддерживается, только AAC/MP3/AC3</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Saving</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранение</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -10566,48 +10601,49 @@
     <message>
         <location line="+0"/>
         <source>Video does not have enough timing information. Are you copying from AVI?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">В видео недостаточно информации для таймингов. Вы копируете из AVI?</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>Cannot rename file (optimize)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно переименовать файл (оптимизировать)</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="+53"/>
         <source>Invalid frequency for AC3. Only 32, 44.1 &amp; 48 kHz</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Неверная частота для AC3. Только 32, 44.1 &amp; 48 кГц</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Invalid bitrate for AC3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Неверный битрейт для AC3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Invalid number of channels for AC3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Неверное количество каналов для AC3</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Cannot get AAC Extra data
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно получить дополнительные данные AAC
+</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp" line="+31"/>
         <source>Optimize for streaming (SLOW)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Оптимизировать для стриминга (МЕДЛЕННО)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add ipod metadata</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Добавить метаданные iPod</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>MP4V2 Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройки MP4V2</translation>
     </message>
 </context>
 <context>
@@ -10630,22 +10666,22 @@
     <message>
         <location line="+23"/>
         <source>Width</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ширина</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Height</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Высота</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Border Width</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ширина границы</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>Preview. Click in the image above to coarsly set the box coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предпросмотр. Щелкните на изображение выше для примерной установки координат</translation>
     </message>
 </context>
 <context>
@@ -10683,7 +10719,7 @@
     <message>
         <location line="+1"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Резкие грани без увеличения шума. От Donald Graft.</translation>
     </message>
 </context>
 <context>
@@ -10691,17 +10727,17 @@
     <message>
         <location filename="../../common/gui_navigate.cpp" line="+243"/>
         <source>Cannot go to next keyframe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно перейти к следующему ключевому кадру</translation>
     </message>
     <message>
         <location line="+69"/>
         <source>Cannot go to previous keyframe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно перейти к предыдущему ключевому кадру</translation>
     </message>
     <message>
         <location line="+177"/>
         <source>Seek</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Перейти</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -10737,12 +10773,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp" line="+136"/>
         <source>Low Quality</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Низкое качество</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>High Quality</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Высокое качество</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10752,37 +10788,37 @@
     <message>
         <location line="+1"/>
         <source>Low Latency</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Низкий отклик</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Latency (LQ)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Низкий отклик (низкое качество)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Latency (HQ)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Низкий отклик (высокое качество)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Preset:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предустановка:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Битрейт (кб/с):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный битрейт (кб/с):</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Nvidia H264 Encoder configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка кодека Nvidia H264</translation>
     </message>
 </context>
 <context>
@@ -10803,7 +10839,7 @@
         <location line="+76"/>
         <location line="+264"/>
         <source>Malformed header</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Заголовок неверной формы</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
@@ -10816,22 +10852,22 @@
     <message>
         <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
         <source>Start time (ms):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Начальное время (мс):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>End time (ms):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Конечное время (мс):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Configure filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настроить фильтр</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Partial Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Частичный фильтр</translation>
     </message>
 </context>
 <context>
@@ -10851,7 +10887,7 @@
     <message>
         <location line="+1"/>
         <source>Display some informations on Screen.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вывод некоторой информации на экран.</translation>
     </message>
 </context>
 <context>
@@ -10964,22 +11000,22 @@
         <location line="+14"/>
         <location line="+14"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Текстовая метка</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Extra Video Properties</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительные свойства видео</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>ExtraDataSize:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер дополнительные данных:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Extra data :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительные данные : </translation>
     </message>
     <message>
         <location line="+121"/>
@@ -10998,17 +11034,18 @@
         <location line="+0"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Индекс &apos;этого файла был создан старой версией Avidemux.
+Пожалуйста, удалите файл idx2 и откройте заново.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
         <source>Indexing</source>
-        <translation type="unfinished">Индектирование</translation>
+        <translation type="unfinished">Индексирование</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обнаружены несколько файлов с последовательными именами. Загрузить их все?</translation>
     </message>
 </context>
 <context>
@@ -11016,7 +11053,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать файл аудио</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -11027,37 +11064,37 @@
     <message>
         <location line="-140"/>
         <source>Cannot use that file as audio track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно использовать файл как аудиодорожку</translation>
     </message>
     <message>
         <location line="+140"/>
         <source>Some tracks are used multiple times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Некоторые дорожки использованы несколько раз</translation>
     </message>
     <message>
         <location line="+126"/>
         <source>Track </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дорожка </translation>
     </message>
     <message>
         <location line="+0"/>
         <source> from video</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> из видео</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>File </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Файл </translation>
     </message>
     <message>
         <location line="+34"/>
         <source>.... Add audio track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">.... Добавить аудиодорожку</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>copy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Копировать</translation>
     </message>
 </context>
 <context>
@@ -11131,7 +11168,8 @@
         <location line="+575"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Приложение столкнулось с критической проблемой
+Ход текущего редактирования сохранен и будет загружен при следующем запуске</translation>
     </message>
     <message>
         <location line="+258"/>
@@ -11141,7 +11179,7 @@
     <message>
         <location line="+257"/>
         <source> (%d track(s))</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> (%d дорожек)</translation>
     </message>
 </context>
 <context>
@@ -11149,47 +11187,47 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp" line="+51"/>
         <source>Project Script</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Скрипт проекта</translation>
     </message>
     <message>
         <location line="+4"/>
         <source> Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> Проект</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&amp;Run Project...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Запустить проект...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Debug Project...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Отладить проект...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Save &amp;As Project...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить &amp;как проект...</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Scripting Shell</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Скриптовая командная строка...</translation>
     </message>
     <message>
         <location line="+4"/>
         <source> Shell</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> Командная строка</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Scripting Reference</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Скриптовая сноска</translation>
     </message>
     <message>
         <location line="+4"/>
         <source> Reference</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> Сноска</translation>
     </message>
 </context>
 <context>
@@ -11217,7 +11255,7 @@
     <message>
         <location line="+0"/>
         <source>Running</source>
-        <translation type="unfinished">Исполняется</translation>
+        <translation type="unfinished">Выполняется</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -11253,7 +11291,7 @@
     <message>
         <location line="+0"/>
         <source>Are you sure you want to delete %s job?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вы уверены, что хотите удалить задание %s?</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -11273,7 +11311,7 @@
     <message>
         <location line="+0"/>
         <source>This script has already been successfully executed.</source>
-        <translation type="unfinished">Этот скрипт уже был выполнен</translation>
+        <translation type="unfinished">Этот скрипт уже был выполнен.</translation>
     </message>
 </context>
 <context>
@@ -11294,17 +11332,17 @@
     <message>
         <location line="+0"/>
         <source>This filter cannot be made partial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Этот фильтр не может быть применен частично</translation>
     </message>
     <message>
         <location line="+177"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Добавить</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -11314,27 +11352,27 @@
     <message>
         <location line="+1"/>
         <source>Move up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Переместить вверх</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Move down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Переместить вниз</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Make partial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сделать частичным</translation>
     </message>
     <message>
         <location line="+79"/>
         <source>Load video filters..</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Загрузить фильтры видео...</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save video filters..</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить фильтры видео...</translation>
     </message>
 </context>
 <context>
@@ -11347,17 +11385,17 @@
     <message>
         <location line="+94"/>
         <source>_Resume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Продолжить</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The processing is paused.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обработка приостановлена.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel it ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отменить ее ?</translation>
     </message>
 </context>
 <context>
@@ -11385,7 +11423,7 @@
     <message>
         <location line="-46"/>
         <source>%2.3f fps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%2.3f кадров/с</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -11405,14 +11443,16 @@
         <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Введите команды и нажмите кнопку "Выполнить" или CTRL+ENTER.
+</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can use CTRL+PageUP and CTRL+Page Down to recall previous commands
 Ready.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вы можете использовать CTRL+Page Up и CTRL+Page Down для вызова предыдущих команд
+Готово.</translation>
     </message>
 </context>
 <context>
@@ -11427,24 +11467,24 @@
         <location line="+25"/>
         <location line="+25"/>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Информация</translation>
     </message>
     <message>
         <location line="+24"/>
         <location line="+30"/>
         <source>Confirmation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Подтверждение</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+30"/>
         <source>Question</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вопрос</translation>
     </message>
     <message>
         <location line="-7"/>
         <source>Question?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вопрос?</translation>
     </message>
 </context>
 <context>
@@ -11452,7 +11492,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="+82"/>
         <source>Open Avidemux</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Открыть Avidemux</translation>
     </message>
 </context>
 <context>
@@ -11460,7 +11500,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
         <source>Select Idx File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать файл IDX</translation>
     </message>
 </context>
 <context>
@@ -11468,47 +11508,47 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="+45"/>
         <source>Remove  Plane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить плоскость</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove Y,U or V plane (used mainly to debug other filters).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить плоскость Y, U или V (используется в основном для отладки других фильтров).</translation>
     </message>
     <message>
         <location line="+105"/>
         <source>Keep Y Plane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить плоскость Y</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Process luma plane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обработать плоскость luma</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep U Plane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить плоскость U</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Process chromaU plane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обработать плоскость chromaU</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep V Plane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить плоскость V</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Process chromaV plane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обработать плоскость chromaV</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove plane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить плоскость</translation>
     </message>
 </context>
 <context>
@@ -11560,12 +11600,12 @@
     </message>
     <message>
         <location line="+35"/>
-        <source>Resample FPS</source>
+        <source>Ресэмплировать кадры/с</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Change and enforce FPS. Keep duration and sync.</source>
+        <source>Изменить кадры/с и установить их принудительно. Сохраняет продолжительность и синхронизацию.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11662,7 +11702,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
         <source>Source:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Источник:</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -11758,7 +11798,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-18"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-18"/>
         <source>Destination:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Приемник:</translation>
     </message>
     <message>
         <location line="+44"/>
@@ -11773,7 +11813,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
         <source>Resize Dimensions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Изменить размер приемника</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -11788,7 +11828,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
         <source>Width:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ширина:</translation>
     </message>
     <message>
         <location line="+36"/>
@@ -11803,7 +11843,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+36"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+36"/>
         <source>Height:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Высота:</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -11818,7 +11858,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+35"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+35"/>
         <source>Round to the Nearest Multiple of 16</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Округлить до ближайшего множества 16</translation>
     </message>
     <message>
         <location line="+55"/>
@@ -11849,7 +11889,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
         <source>Percent</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Процент</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -11880,7 +11920,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+50"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+50"/>
         <source>Error X / Y:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ошибка X / Y</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -11910,7 +11950,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+51"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+51"/>
         <source>Resize Method:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Метод изменения размера:</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -11925,7 +11965,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+8"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+8"/>
         <source>Bilinear</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Билинейный</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11956,7 +11996,7 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
         <location line="+163"/>
         <source>Rotate</source>
-        <translation type="unfinished">Вращать</translation>
+        <translation type="unfinished">Повернуть</translation>
     </message>
     <message>
         <location line="-7"/>
@@ -11986,7 +12026,7 @@
     <message>
         <location line="-160"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Повернуть изображение на 90/180/270 градусов.</translation>
     </message>
     <message>
         <location line="+156"/>
@@ -12044,7 +12084,7 @@
     <message>
         <location line="+76"/>
         <source>next</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">дальше</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -12057,12 +12097,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp" line="+53"/>
         <source>Separate Fields</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Разделить поля</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Split each image into 2 fields.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Разделить каждое изображение на 2 поля.</translation>
     </message>
 </context>
 <context>
@@ -12070,12 +12110,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp" line="+27"/>
         <source>Sharpen convolution.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Свертка резкости</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3x3 convolution filter :sharpen.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фильтр свертки 3x3 :sharpen</translation>
     </message>
 </context>
 <context>
@@ -12083,12 +12123,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp" line="+47"/>
         <source>Stack Fields</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Стековые поля</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Put even lines on top, odd lines at bottom.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Установить четные линии вверх, нечетные вниз.</translation>
     </message>
 </context>
 <context>
@@ -12128,12 +12168,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
         <source>Swap UV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Замена UV</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Swap the U and V planes.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Замена плоскостей U и V.</translation>
     </message>
 </context>
 <context>
@@ -12146,7 +12186,7 @@
     <message>
         <location line="+1"/>
         <source>Donald Graft Telecide. Replace ivtc pattern by progressive frames. Video stays at 30 fps.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Donald Graft Telecide. Заменить паттерн ivtc прогрессивными кадрами. Частота кадров видео остается на 30 кадрах/с.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+185"/>
@@ -12166,17 +12206,17 @@
     <message>
         <location line="+1"/>
         <source>NTSC converted from PAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">NTSC, конвертированный из PAL</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вверх</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вниз</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -12201,27 +12241,27 @@
     <message>
         <location line="+1"/>
         <source>None but compute</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нет, но вычислить</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Postproc on best match</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Постпроцессинг на лучшем совпадении</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Postproc and show zones (debug)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Постпроцессинг и медленные зоны (отладка)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Process image (not fields)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обработать изображение (не поля)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Process image (not fields), debug</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обработать изображение (не поля), отладка</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -12281,7 +12321,7 @@
     <message>
         <location line="+1"/>
         <source>Bl_end</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Смешивание</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -12300,20 +12340,21 @@
         <location line="+0"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 Please delete the idx2 file and reopen.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Индекс &apos;этого файла был создан старой версией Avidemux.
+Пожалуйста, удалите файл idx2 и откройте заново.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+124"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обнаружены несколько файлов с последовательными именами. Загрузить их все?</translation>
     </message>
     <message>
         <location line="+9"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
         <source>Indexing</source>
-        <translation type="unfinished">Индектирование</translation>
+        <translation type="unfinished">Индексирование</translation>
     </message>
 </context>
 <context>
@@ -12326,7 +12367,7 @@
     <message>
         <location line="+5"/>
         <source>TwoLame Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка TwoLame</translation>
     </message>
 </context>
 <context>
@@ -12364,7 +12405,7 @@
     <message>
         <location line="+3"/>
         <source>Default Raster</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Растер по умолчанию</translation>
     </message>
 </context>
 <context>
@@ -12372,12 +12413,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp" line="+47"/>
         <source>Unstack Fields</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нестековые поля</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Weave top and bottom halves.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Верхние и нижние половины.</translation>
     </message>
 </context>
 <context>
@@ -12390,22 +12431,22 @@
     <message>
         <location line="+1"/>
         <source>VDPAU deinterlacer (+resize).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Деинтерлейсер (+ изменение размеров) VDPAU</translation>
     </message>
     <message>
         <location line="+185"/>
         <source>Keep Top Field</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить верхнее поле</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep Bottom Field</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить нижнее поле</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double framerate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удвоить частоту кадров</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -12415,22 +12456,22 @@
     <message>
         <location line="+1"/>
         <source>_Resize:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Изменить размер:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Deint Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Режим деинтерлейсинга:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Width :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ширина :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Height :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Высота :</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -12443,22 +12484,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+69"/>
         <source>vdpau: Resize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">vdpau: Изменить размер</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>vdpau: Resize image using vdpau.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">vdpau: Изменить размер с помощью vdpau.</translation>
     </message>
     <message>
         <location line="+133"/>
         <source>Width :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ширина :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Height :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Высота :</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -12471,12 +12512,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp" line="+47"/>
         <source>Vertical Flip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вертикальное отражение</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Vertically flip the image.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вертикально отрзить изображение.</translation>
     </message>
 </context>
 <context>
@@ -12565,27 +12606,27 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="+13"/>
         <source>Subtitle Font Size and Position</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер шрифта и положение субтитров</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Delay :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отложить :</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Select File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выбрать файл</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Language :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Язык :</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Idx File :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Файл IDX :</translation>
     </message>
 </context>
 <context>
@@ -12626,12 +12667,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+68"/>
         <source>Open VapourSynth File 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Открыть файл VapourSynth 1</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>VS File Files (*.vpy)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Файлы VS (*.vpy)</translation>
     </message>
 </context>
 <context>
@@ -12640,28 +12681,30 @@
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
         <source>Unsupported Video.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Видео не поддерживается.
+Поддерживаются только видео VP8/VP9 и аудио Vorbis/Opus</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Unsupported Audio.
 Only VP8/VP9 video and Vorbis/Opus audio supported</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Аудио не поддерживается.
+Поддерживаются только видео VP8/VP9 и аудио Vorbis/Opus</translation>
     </message>
     <message>
         <location line="+76"/>
         <source>Saving Webm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранение WEBM</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp" line="+27"/>
         <source>Force display width</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Принудительно устанавливать ширину монитора</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display width</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ширина монитора</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -12684,7 +12727,7 @@
     <message>
         <location line="-22"/>
         <source>Elapsed:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Прошло времени</translation>
     </message>
     <message>
         <location line="+48"/>
@@ -12694,7 +12737,7 @@
     <message>
         <location line="+87"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отмена</translation>
     </message>
 </context>
 <context>
@@ -12702,18 +12745,18 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
         <source>Not coded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Не разработано</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>this mode has not been implemented
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">этот режим еще не разработан</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">нет</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -12723,52 +12766,56 @@
     <message>
         <location line="+411"/>
         <source>Target Bitrate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Целевой битрейт:</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+19"/>
         <source>kbit/s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">кб/с</translation>
     </message>
     <message>
         <location line="-15"/>
         <source>Quantiser:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизатор:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Качество:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Целевой размер видео:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мб</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Average Bitrate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Средний битрейт:</translation>
     </message>
     <message>
         <location line="+68"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Для оптимизации дерева макроблоков требуется включенная адаптивная квантизация дисперсии.  Адаптивная квантизация дисперсии будет включена автоматически.
+
+Вы хотите продолжить?</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Для оптимизации дерева макроблоков требуется включенная адаптивная квантизация дисперсии.  Оптимизация дерева макроблоков будет включена автоматически.
+
+Вы хотите продолжить?</translation>
     </message>
     <message>
         <location line="+41"/>
@@ -12780,58 +12827,59 @@
     <message>
         <location line="-83"/>
         <source>Cannot load preset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно загрузить предустановку</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save Profile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить профиль</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>my profile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">мой профиль</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Перезаписать</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Replace the following preset ?:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Заменить следующую предустановку ?:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Cannot save preset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно сохранить предустановку</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Cannot delete custom profile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно удалить измененный профиль</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Do you really want to delete the </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вы действительно хотите удалить </translation>
     </message>
     <message>
         <location line="+1"/>
         <source> profile ?.
 If it is a system profile it will be recreated next time.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> профиль ?.
+Если этот профиль является системным, он будет создан заново при следующем запуске.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Delete preset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить предустановку</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить</translation>
     </message>
 </context>
 <context>
@@ -12912,63 +12960,63 @@
     <message>
         <location line="+232"/>
         <source>Crop</source>
-        <translation type="unfinished">Обрезка   </translation>
+        <translation type="unfinished">Обрезка</translation>
     </message>
     <message>
         <location line="-3641"/>
         <source>x264 Configuraton</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка x264</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Configuration:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить как</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+3152"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить</translation>
     </message>
     <message>
         <location line="-3110"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Общий</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Basic</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Основной</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Use advanced configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Использовать дополнительные настройки</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Profile:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Профиль:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Preset:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предустановка:</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>Tuning:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>IDC Level:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Уровень IDC:</translation>
     </message>
     <message>
         <location line="+38"/>
@@ -13065,117 +13113,117 @@
     <message>
         <location line="+25"/>
         <source>Fast Decode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Быстрое декодирование</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Zero Latency</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нулевой отклик</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Fast First Pass</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Быстрый первый проход</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Threads </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Потоки </translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Целевой размер файла:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Constant Bitrate (Single Pass)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Постоянный битрейт (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Quantiser (Single Pass)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Постоянный квантизатор (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Rate Factor (Single Pass)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Постоянный фактор частоты (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Video Size (Two Pass)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер видео (2 прохода)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average Bitrate (Two Pass)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Средний битрейт (2 прохода)</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Encoding Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Режим кодирования:</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мб</translation>
     </message>
     <message>
         <location line="+60"/>
         <location line="+200"/>
         <source>0 (High Quality)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">0 (высокое качество)</translation>
     </message>
     <message>
         <location line="-177"/>
         <location line="+200"/>
         <location line="+1649"/>
         <source>Quantiser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизатор</translation>
     </message>
     <message>
         <location line="-1826"/>
         <location line="+200"/>
         <source>51 (Low Quality)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">51 (низкое качество)</translation>
     </message>
     <message>
         <location line="-101"/>
         <source>Advanced RC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительный КЧ</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Advanced Rate Control</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительный контроль частоты</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Maximum Constant Rate Factor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный постоянный фактор частоты</translation>
     </message>
     <message>
         <location line="+158"/>
         <source>Macroblock-tree Rate Control</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Контроль частоты дерева макроблоков</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Frametype Lookahead:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предвидение типа кадров:</translation>
     </message>
     <message>
         <location line="+14"/>
         <location line="+2490"/>
         <source>frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">кадры:</translation>
     </message>
     <message>
         <location line="-2466"/>
         <source>Sequence Parameter Set Identifer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Идентификатор установки параметров последовательности:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -13204,62 +13252,62 @@
     <message>
         <location line="+42"/>
         <source>Motion</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Движение</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Motion Estimation Method:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Метод оценки движения:</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Uneven Multi-hexagonal Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нечетный мультигексагональный поиск:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Exhaustive Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Расширенный поиск</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hadamard Exhaustive Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Расширенный поискHadamard</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>1 (Fast)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">1 (Быстрый)</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Subpixel Refinement</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Субпиксельная точность</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>10 (Best)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">10 (Лучший)</translation>
     </message>
     <message>
         <location line="+78"/>
         <source>Motion Vector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вектор движения</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Maximum Motion Vector Length:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальная длина вектора движения:</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Minimum Buffer Between Threads:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный буфер между потоками:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Motion Vector Search Range:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный диапазон поиска вектора движения:</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -13269,92 +13317,92 @@
     <message>
         <location line="+16"/>
         <source>Weighted References</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Взвешенные отсылки</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Weighted References + Duplicates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Взвешенные отсылки + дубликаты</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Direct Prediction Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Режим прямого предсказания:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Weighted Prediction for P-frames:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Взвешенное предсказание для кадров P:</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Spatial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Пространственный</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Temporal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Временной</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Weighted Prediction for B-frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Взвешенное предсказание для кадров B:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Constrained Intra Prediction</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ограниченное внутреннее предсказание</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Partition</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Часть</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Partition Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Поиск части</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>8x8 DCT Spatial Transform</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">8x8 DCT пространственное трансформирование</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>8x8, 8x16 and 16x8 P-frame Intra-predicted Blocks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">8x8, 8x16 and 16x8 предсказанные внутренне блоки кадров P</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>8x8, 8x16 and 16x8 B-frame Intra-predicted Blocks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">8x8, 8x16 and 16x8 предсказанные внутренне блоки кадров B</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>4x4, 4x8 and 8x4 P-frame Intra-predicted Blocks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">4x4, 4x8 and 8x4 предсказанные внутренне блоки кадров P</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>8x8 Intra-predicted Blocks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">8x8 предсказанные внутренне блоки</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>4x4 Intra-predicted Blocks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">4x4 предсказанные внутренне блоки</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Кадр</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Frame Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Кодировка кадров</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -13364,235 +13412,235 @@
     <message>
         <location line="+9"/>
         <source>Loop Filter:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фильтр зацикливания:</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+1328"/>
         <source>Strength:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сила:</translation>
     </message>
     <message>
         <location line="-1289"/>
         <source>Threshold:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Порог:</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Open GOP:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Открыть GOP:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Normal Mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нормальный режим</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Blu-ray Mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Режим Blu-ray</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Interlaced:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Интерлейсинг:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Bottom Field First</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сначала нижнее поле</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Top Field First</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сначала верхнее поле</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Maximum Reference Frames:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимум кадров как ссылок:</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>B-frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">B-кадры</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>B-frames as References:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">B-кадры как ссылки:</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Strictly Hierarchical Pyramid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Строгая иерархическая пирамида</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Non-strict (Not Blu-ray Compatible)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нестрогая (не совместима с Blu-ray)</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Optimal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Оптимальная</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>B-frame Bias:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Смещение B-кадров:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Consecutive B-frames:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимум последовательных B-кадров:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Adaptive B-frame Decision:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Адаптивное определение B-кадров:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>I-frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">I-кадры</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>GOP Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер GOP:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Minimum:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Минимум:</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Maximum:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимум:</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>I-frame Threshold:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Попрог I-кадров:</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Periodic Intra Refresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Периодическое внутреннее обновление</translation>
     </message>
     <message>
         <location line="+24"/>
         <location line="+6"/>
         <source>Analysis</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Анализ</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Mixed References</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Смешанные ссылки</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Chroma Motion Estimation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Оценка движения chroma</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Trellis Quantization:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация Треллиса:</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Final Macroblock Only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Только последний макроблок</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Always On</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Всегда включено</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Fast Skip Detection on P-frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Быстрый пропуск обнаружения на P-кадрах:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>DCT Decimation on P-frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Децимация DCT на P-кадрах:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Psychovisual Rate Distortion Optimisation:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Оптимизация психовизуального искажения частоты</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Psychovisual Trellis:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Психовизуальный Треллис:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Noise Reduction:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Уменьшение шума:</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Luma Quantisation Deadzone</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мертвая зона квантизации Luma</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Intra Luma Quantisation Deadzone:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мертвая зона квантизации внутренней Luma:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Inter Luma Quantisation Deadzone:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мертвая зона квантизации внешней Luma:</translation>
     </message>
     <message>
         <location line="+66"/>
         <source>Quantisation Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Матрица квантизации</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Flat Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Плоская матрица</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>JVT Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Матрица JVT</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Собственная матрица</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+856"/>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Редактировать</translation>
     </message>
     <message>
         <location line="-809"/>
         <source>Quantiser Control</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Управление квантизатором</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Maximum Quantiser:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный квантизатор:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>I and P-frame Quantiser Ratio:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Соотношение квантизатора I- и P-кадров:</translation>
     </message>
     <message>
         <location line="+85"/>
@@ -13604,67 +13652,67 @@
     <message>
         <location line="-459"/>
         <source>Maximum Quantiser Step:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный шаг квантизатора:</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>P and B-frame Quantiser Ratio:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Соотношение квантизатора P- и B-кадров:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Average Bitrate Tolerance:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Допустимый средний битрейт:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Chroma to Luma Quantiser Offset:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Смещение квантизатора от Chroma до Luma:</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Minimum Quantiser:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Минимальный квантизатор:</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Quantiser Curve Compression</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сжатие кривой квантизатора</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Quantiser Curve Compression:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сжатие кривой квантизатора:</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Reduce Fluctuation Before Curve Compression:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Уменьшить колебание до компрессии кривых:</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Reduce Fluctuation After Curve Compression:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Уменьшить колебание после компрессии кривых:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Adaptive Quantisation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Адаптивная квантизация</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Variance AQ:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отклонение адаптивной квантизации:</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Auto Variance AQ</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Автоматическое отклонение адаптивной квантизации:</translation>
     </message>
     <message>
         <location line="+91"/>
         <source>Advanced 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительно 1</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -13674,124 +13722,124 @@
     <message>
         <location line="+8"/>
         <source>Maximum VBV Bitrate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный битрейт VBV:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Initial VBV Buffer Occupancy:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Начальное заполнение буфера VBV:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>kbit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">кбит</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>kbit/s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">кбит/с</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>VBV Buffer Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер буфера VBV:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Slicing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Разделение на части</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Slices per Frame:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Частей на кадр:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Size per Slice:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный размер на часть:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>bytes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">байт</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Maximum Macroblocks per Slice:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимум макроблоков на часть:</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>Zones</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Зоны</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Добавить</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Advanced 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительно 2</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Multithreading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Многопоточность:</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Custom:</source>
         <comment>multithreading</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Собственный:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Enforce Repeatability</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Принудительная повторяемость</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Slice-based Threading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Многопоточность по частям</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Threaded Lookahead Buffer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Буфер предвидения собственных потоков:</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Output 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выход 1</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Generate Access Unit Delimiters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Генерировать разделители единиц доступа</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>BluRay compatibility</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Совместимость с BluRay</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Generate fake interlaced</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Генерировать поддельный интерлейсинг</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Custom:</source>
         <comment>PAR</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Собственный:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>As Input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Как вход</translation>
     </message>
     <message>
         <location line="+49"/>
@@ -13801,7 +13849,7 @@
     <message>
         <location line="+35"/>
         <source>Predefined Aspect Ratio:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предопределенное соотношение сторон:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -13826,22 +13874,22 @@
     <message>
         <location line="+42"/>
         <source>Output 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выход 2</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Video Usability Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Информация об использовании видео</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Эти настройки всего лишь предлагаются для воспроизведения на оборудовании. Используйте их на свой страх и риск.</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Overscan:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Пересканирование:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -13850,22 +13898,22 @@
         <location line="+63"/>
         <location line="+73"/>
         <source>Undefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Не определено</translation>
     </message>
     <message>
         <location line="-235"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Показать</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Video Format:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Формат видео:</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Component</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Компонент</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -13890,7 +13938,7 @@
     <message>
         <location line="+23"/>
         <source>Colour Primaries:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Первичные цвета:</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -13933,12 +13981,12 @@
     <message>
         <location line="+23"/>
         <source>Transfer Characteristics:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Характеристики перехода:</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Linear</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Линейный</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -13958,7 +14006,7 @@
     <message>
         <location line="+28"/>
         <source>Colour Matrix:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Цветовая матрица:</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -13978,7 +14026,7 @@
     <message>
         <location line="+23"/>
         <source>HRD Parameters:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Параметры HRD:</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -13993,12 +14041,12 @@
     <message>
         <location line="+23"/>
         <source>Chroma Sample Location:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Местонахождение образца Chroma:</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Full Range Samples</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Образцы полного диапазона</translation>
     </message>
 </context>
 <context>
@@ -14006,12 +14054,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui" line="+16"/>
         <source>x264 Custom Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Собственная матрица x264</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Intra 4x4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внутренняя 4x4</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -14030,22 +14078,22 @@
     <message>
         <location line="-238"/>
         <source>Inter 4x4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внешняя 4x4</translation>
     </message>
     <message>
         <location line="+446"/>
         <source>Intra 8x8</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внутренняя 8x8</translation>
     </message>
     <message>
         <location line="+703"/>
         <source>Inter 8x8</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внешняя 8x8</translation>
     </message>
     <message>
         <location line="+727"/>
         <source>Load File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Загрузить файл</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -14055,7 +14103,7 @@
     <message>
         <location line="+10"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отмена</translation>
     </message>
 </context>
 <context>
@@ -14063,18 +14111,19 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
         <source>Not coded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Не разработано</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>this mode has not been implemented
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">этот режим не разработан
+</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+185"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">нет</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -14084,52 +14133,56 @@
     <message>
         <location line="+357"/>
         <source>Target Bitrate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Целевой битрейт</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+20"/>
         <source>kbit/s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">кбит/с</translation>
     </message>
     <message>
         <location line="-15"/>
         <source>Quantiser:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизатор:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Качество:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Целевой размер видео:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мб</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Average Bitrate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Средний битрейт</translation>
     </message>
     <message>
         <location line="+63"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Для оптимизации дерева макроблоков требуется включенная адаптивная квантизация дисперсии.  Адаптивная квантизация дисперсии будет включена автоматически.
+
+Вы хотите продолжить?</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Для оптимизации дерева макроблоков требуется включенная адаптивная квантизация дисперсии.  Оптимизация дерева макроблоков будет включена автоматически.
+
+Вы хотите продолжить?</translation>
     </message>
     <message>
         <location line="+41"/>
@@ -14141,53 +14194,54 @@
     <message>
         <location line="-83"/>
         <source>Cannot load preset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно загрузить предустановку</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save Profile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить профиль</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Перезаписать</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Replace the following preset ?:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Заменить следующую предустановку ?:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Cannot save preset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно сохранить предустановку</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Cannot delete custom profile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Невозможно удалить собственный профиль</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Do you really want to delete the </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вы действительно хотите удалить </translation>
     </message>
     <message>
         <location line="+1"/>
         <source> profile ?.
 If it is a system profile it will be recreated next time.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> профиль ?.
+Если этот профиль является системным, он будет создан заново при следующем запуске.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Delete preset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить предустановку</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить</translation>
     </message>
 </context>
 <context>
@@ -14195,63 +14249,63 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
         <source>x265 Configuraton</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка x265</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Configuration:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка:</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить как</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+2731"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить</translation>
     </message>
     <message>
         <location line="-2689"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Общий</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Basic</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Основной</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Use advanced configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Использовать дополнительные настройки</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Profile:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Профиль</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Preset:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предустановка</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>Tuning:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>IDC Level:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Уровень IDC:</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Auto</source>
-        <translation type="unfinished">Авто</translation>
+        <translation type="unfinished">Автоматически</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -14348,12 +14402,12 @@
     <message>
         <location line="+27"/>
         <source>Pool Threads </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Потоки пула</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Frame Threads </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Потоки кадров</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -14363,102 +14417,102 @@
     <message>
         <location line="+21"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Целевой размер файла:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Constant Bitrate (Single Pass)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Постоянный битрейт (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Quantiser (Single Pass)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Постоянный квантизатор (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Rate Factor (Single Pass)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Постоянный фактор частоты (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Video Size (Two Pass)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер видео (2 прохода)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average Bitrate (Two Pass)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Средний битрейт (2 прохода)</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Encoding Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Режим кодирования:</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мб</translation>
     </message>
     <message>
         <location line="+44"/>
         <location line="+213"/>
         <source>0 (High Quality)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">0 (высокое качество)</translation>
     </message>
     <message>
         <location line="-190"/>
         <location line="+213"/>
         <location line="+1267"/>
         <source>Quantiser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизатор</translation>
     </message>
     <message>
         <location line="-1457"/>
         <location line="+213"/>
         <source>51 (Low Quality)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">51 (низкое качество)</translation>
     </message>
     <message>
         <location line="-143"/>
         <source>Use Strict Constant Bitrate Mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Использовать режим строго постоянного битрейта</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Advanced RC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительный КЧ</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Advanced Rate Control</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительный контроль частоты</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Maximum Constant Rate Factor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фактор максимальной постоянной частоты</translation>
     </message>
     <message>
         <location line="+158"/>
         <source>Coding Unit-tree Rate Control</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Управление частотой кодирования дерева частей</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Frametype Lookahead:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предвидение типа кадров:</translation>
     </message>
     <message>
         <location line="+14"/>
         <location line="+2070"/>
         <source>frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">кадры</translation>
     </message>
     <message>
         <location line="-2046"/>
         <source>Sequence Parameter Set Identifer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Идентификатор установки параметра последовательности:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14487,7 +14541,7 @@
     <message>
         <location line="+42"/>
         <source>Motion</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Движение</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -14497,7 +14551,7 @@
     <message>
         <location line="+8"/>
         <source>Motion Estimation Method:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Метод определения движения:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -14512,62 +14566,62 @@
     <message>
         <location line="+5"/>
         <source>Uneven Multi-hexagonal Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нечеткий мультигексагональный поиск</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Star Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Начать поиск</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Exhaustive Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Расширенный поиск</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>1 (Fast)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">1 (быстрый)</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Subpixel Refinement</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Субпиксельная точность</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>7 (Best)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">7 (лучший)</translation>
     </message>
     <message>
         <location line="+78"/>
         <source>Motion Vector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вектор движения</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Maximum Motion Vector Search Range:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Диапазон поиска вектора максимального движения:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Prediction</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предсказание:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Weighted Prediction for B-frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Взвешенное предсказание для B-кадров</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Constrained Intra Prediction</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ограниченное внутреннее предсказание</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Weighted Prediction for P-frames:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Взвешенное предсказание для P-кадров</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14579,82 +14633,82 @@
     <message>
         <location line="-248"/>
         <source>Weighted References</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Взвешенные ссылки</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Weighted References + Duplicates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Взвешенные ссылки + дубликаты</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Кадр</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Frame Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Кодирование кадра</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Loop Filter:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фильтр зацикливания:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Open GOP:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Открыть GOP:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Normal Mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нормальный режим</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Blu-ray Mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Режим Blu-ray</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Interlaced:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Интерлейсинг:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Top Field First</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сначала верхнее поле:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Bottom Field First</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сначала нижнее поле:</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Maximum Reference Frames:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимум кадров-ссылок:</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>B-frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">B-кадры</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>B-frames as References:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">B-кадры как ссылки:</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Strictly Hierarchical Pyramid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Строгая иерархическая пирамида</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Non-strict (Not Blu-ray Compatible)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нестрогая (не совместима с Blu-ray)</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -14664,139 +14718,139 @@
     <message>
         <location line="+5"/>
         <source>Optimal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Оптимально</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>B-frame Bias:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Смещение B-кадров:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Consecutive B-frames:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимум последовательных B-кадров:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Adaptive B-frame Decision:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Адаптивное определение B-кадров:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>I-frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">I-кадры</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>GOP Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер GOP:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Minimum:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Минимум:</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Maximum:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимум:</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>I-frame Threshold:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Порог I-кадров:</translation>
     </message>
     <message>
         <location line="+53"/>
         <location line="+6"/>
         <source>Analysis</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Анализ</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Trellis Quantization:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация Треллиса:</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Final Macroblock Only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Только последний макроблок</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Always On</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Всегда включено</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Fast Skip Detection on P-frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Быстрый пропуск обнаружения P-кадров</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>DCT Decimation on P-frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Децимация DCT на P-кадрах</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Psychovisual Rate Distortion Optimisation:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Оптимизация психовизуального искажения частоты</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Noise Reduction:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Уменьшение шума:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Noise Reduction Intra:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внутреннее уменьшение шума:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Noise Reduction Inter:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внешнее уменьшение шума:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Quantisation Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Матрица квантизации</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Flat Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Плоская матрица</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>JVT Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Матрица JVT</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Собственная матрица</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+818"/>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Редактировать</translation>
     </message>
     <message>
         <location line="-771"/>
         <source>Quantiser Control</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Управление квантизатором</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Chroma to Luma Quantiser Offset:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Смещение квантизатора от Chroma до Luma:</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>I and P-frame Quantiser Ratio:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Соотношение квантизатора I- и P-кадров:</translation>
     </message>
     <message>
         <location line="+58"/>
@@ -14808,7 +14862,7 @@
     <message>
         <location line="-448"/>
         <source>Maximum Quantiser Step:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный шаг квантизатора:</translation>
     </message>
     <message>
         <location line="+19"/>
@@ -14823,42 +14877,42 @@
     <message>
         <location line="+22"/>
         <source>P and B-frame Quantiser Ratio:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Соотношение квантизатора P- и B-кадров:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Average Bitrate Tolerance:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Допустимый средний битрейт</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Quantiser Curve Compression</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Компрессия кривых квантизатора</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Quantiser Curve Compression:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Компрессия кривых квантизатора:</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Reduce Fluctuation Before Curve Compression:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Уменьшить колебание до компрессии кривых:</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Reduce Fluctuation After Curve Compression:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Уменьшить колебание после компрессии кривых:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Adaptive Quantisation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Адаптивная квантизация</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Variance AQ:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отклонение адаптивной квантизации:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -14868,17 +14922,17 @@
     <message>
         <location line="+5"/>
         <source>Auto Variance AQ</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Автоматическое отклонение адаптивной квантизации:</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Strength:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сила:</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>Advanced 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительно 1</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -14888,77 +14942,77 @@
     <message>
         <location line="+8"/>
         <source>Maximum VBV Bitrate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный битрейт VBV:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Initial VBV Buffer Occupancy:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Начальное заполнение буфера VBV:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>kbit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">кбит</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>kbit/s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">кбит/с</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>VBV Buffer Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Размер буфера VBV:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Slicing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Разделение на части</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Slices per Frame:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Частей на кадр:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Size per Slice:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимальный размер на часть:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>bytes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">байт</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Maximum Macroblocks per Slice:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Максимум макроблоков на часть:</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>Zones</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Зоны</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Добавить</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Advanced 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительно 2</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Multithreading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Многопоточность:</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Disable</source>
-        <translation type="unfinished">Запретить</translation>
+        <translation type="unfinished">Отключить</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -14969,27 +15023,27 @@
         <location line="+12"/>
         <source>Custom:</source>
         <comment>multithreading</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Собственный:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Enforce Repeatability</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Принудительная повторяемость</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Slice-based Threading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Многопоточность по частям</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Threaded Lookahead Buffer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Буфер предвидения собственных потоков:</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Output 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выход 1</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -14999,23 +15053,23 @@
     <message>
         <location line="+6"/>
         <source>Generate Access Unit Delimiters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Генерировать разделители единиц доступа</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Pixel Aspect Ratio</source>
-        <translation type="unfinished">Cоотношение сторон:</translation>
+        <translation type="unfinished">Cоотношение сторон</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Custom:</source>
         <comment>PAR</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Собственный:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>As Input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Как вход</translation>
     </message>
     <message>
         <location line="+49"/>
@@ -15025,7 +15079,7 @@
     <message>
         <location line="+35"/>
         <source>Predefined Aspect Ratio:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Предопределенное соотношение сторон:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -15050,22 +15104,22 @@
     <message>
         <location line="+42"/>
         <source>Output 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выход 2</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Video Usability Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Информация об использовании видео</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Эти настройки всего лишь предлагаются для воспроизведения на оборудовании. Используйте их на свой страх и риск.</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Overscan:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Пересканирование:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15074,27 +15128,27 @@
         <location line="+63"/>
         <location line="+73"/>
         <source>Undefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Не определено</translation>
     </message>
     <message>
         <location line="-235"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Показать</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Crop</source>
-        <translation type="unfinished">Обрезка   </translation>
+        <translation type="unfinished">Обрезка</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Video Format:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Формат видео:</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Component</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Компонент</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -15119,7 +15173,7 @@
     <message>
         <location line="+23"/>
         <source>Colour Primaries:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Первичные цвета:</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -15162,12 +15216,12 @@
     <message>
         <location line="+23"/>
         <source>Transfer Characteristics:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Характеристики перехода:</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Linear</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Линейный</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -15187,7 +15241,7 @@
     <message>
         <location line="+28"/>
         <source>Colour Matrix:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Цветовая матрица:</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -15207,7 +15261,7 @@
     <message>
         <location line="+23"/>
         <source>HRD Parameters:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Параметры HRD:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15227,12 +15281,12 @@
     <message>
         <location line="+23"/>
         <source>Chroma Sample Location:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Местонахождение образца Chroma:</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Full Range Samples</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Образцы полного диапазона</translation>
     </message>
 </context>
 <context>
@@ -15240,12 +15294,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui" line="+14"/>
         <source>x265 Custom Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Собственная матрица x265</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Intra 4x4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внутренняя 4x4</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -15264,22 +15318,22 @@
     <message>
         <location line="-238"/>
         <source>Inter 4x4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внешняя 4x4</translation>
     </message>
     <message>
         <location line="+446"/>
         <source>Intra 8x8</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внутренняя 8x8</translation>
     </message>
     <message>
         <location line="+703"/>
         <source>Inter 8x8</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Внешняя 8x8</translation>
     </message>
     <message>
         <location line="+727"/>
         <source>Load File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Загрузить файл</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -15289,7 +15343,7 @@
     <message>
         <location line="+10"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отмена</translation>
     </message>
 </context>
 <context>
@@ -15338,7 +15392,7 @@
     <message>
         <location line="-65"/>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Полный</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -15373,22 +15427,22 @@
     <message>
         <location line="+4"/>
         <source>One thread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">1 поток</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Two threads)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">2 потока</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Three threads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">3 потока</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Auto (#cpu)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Автоматически (#cpu)</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -15418,77 +15472,77 @@
     <message>
         <location line="+7"/>
         <source>MotionEstimation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Оценка движения</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Mi_n. quantizer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Мин. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ma_x. quantizer:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">М_акс. квантизатор:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>_Trellis quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация _Треллиса</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Number of B frames:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Количество B-кадров:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quantization type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Тип квантизации:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Macroblock decision:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Определение макроблоков:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Profile:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Профиль:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>_Gop Size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Размер GOP:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Use XVID fcc (else DIVX)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Использовать XVID fcc (или DIVX)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Advanced Simple Profile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Дополнительный простой профиль</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Quantization</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Квантизация</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Threads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Потоки</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Aspect Ratio</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Соотношение сторон</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Xvid4 MPEG-4 ASP configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Настройка Xvid4 MPEG-4 ASP</translation>
     </message>
 </context>
 <context>
@@ -15501,27 +15555,27 @@
     <message>
         <location line="+1"/>
         <source>Yadif, port of avisynth version (c) Fizick.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Yadif, порт версии avisynth (c) Fizick.</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>Temporal &amp; spatial check</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Временная &amp; пространственная проверка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bob, temporal &amp; spatial check</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bob, временная &amp; пространственная проверка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Skip spatial temporal check</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Пропустить временную &amp; пространственную проверку</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bob, skip spatial temporal check</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bob, пропустить временную &amp; пространственную проверку</translation>
     </message>
     <message>
         <location line="+3"/>

avidemux_2.6.15.tar.gz/avidemux/winInstaller/What's New.html -> avidemux_2.6.16.tar.gz/avidemux/winInstaller/What's New.html Changed

@@ -52,23 +52,18 @@
     <div id="inner">
         <h1>What's New in Avidemux</h1>
         <ul>
-     <li> Hw Accel    : Fixed nvEnc and added simple nvEnc-HEVC (windows/linux) </li>
-     <li> Hw Accel    : Added support for HEVC/VC1 with libVA (linux) </li>
-     <li> Hw Accel    : Experimental Dxva2 video decoder + Dxva2/D3D display engine (windows) </li>
-     <li> Demux       : Mpeg TS, fix non multiple of 16 file management (euma) </li>
-     <li> Audio/win32 : Fixed CPU consumption when playing audio </li>
-     <li> Editor      : Fixed copy /paste /delete /undo (euma) </li>
-     <li> Editor      : A *lot* of seeking bugs fixed (euma) </li>
-     <li> Editor      : A *lot* of marker management bugs fixed (euma) </li>
-     <li> Audio       : Added FDK-AAC as encoder </li>
-     <li> x26*        : Added a "None" preset </li>
-     <li> x265        : Fixed 2 pass encoding on windows </li>
-     <li> i18n        : Qt4 vs Qt5 language fix (D. Amm) </li>
-     <li> i18n        : German translation updated (euma) </li>
-     <li> UI          : Added reload default settings (euma)  </li>
-     <li> UI          : Allow minimizing to tray while encoding (euma) </li>
-     <li> OSX         : Update to Sierra </li>
-
+            <li> Build : Avidemux can be built with visual c++ 2015 (losing some ASM)</li> 
+            <li> OsX   : Initialize fontconfig so that subtitling works</li>
+            <li> Core  : Update ffmpeg to 3.0.5</li>
+            <li> i18n  : Updated fr and ru translations (jean Elchinger/totalcaesar659)</li>
+            <li> Build : Improved build scripts (euma)</li>
+            <li> x265  : Enforce complicancy with most devices </li>
+            <li> vaapi : Add resizer</li>
+            <li> UI    : Redone UI, revamped contrast filter </li>
+            <li> Qt    : Dont use too much CPU on playback when there is no audio track</li>
+            <li> Qt    : Reenabled nvenc + Fixed keyframe detection </li>
+            <li> Qt    : Fixed a crash when encoding starts very slowly (x265)</li>
+            <li> Build : Allow use of system libass, liba52,libmad (euma)</li>
        </ul>
          <br />
     </div>

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/include/ADM_default.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/include/ADM_default.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/include/ADM_inttype.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/include/ADM_inttype.h Changed

@@ -6,9 +6,7 @@
     
  ***************************************************************************/
 
-#ifndef ADM_INTTYPE_H
-#define ADM_INTTYPE_H
-
+#pragma once
 #include "ADM_coreConfig.h"
 
 #include <stdio.h>
@@ -22,22 +20,22 @@
 
 typedef unsigned char ADM_filename;
 
-#ifdef HAVE_STDINT_H
-#define __STDC_CONSTANT_MACROS
-#define __STDC_LIMIT_MACROS
-#include <stdint.h>
-#define GOT_TYPES
+#if defined( HAVE_STDINT_H) || defined(_MSC_VER) //  We do have stdint , heck it is embedded
+  #define __STDC_CONSTANT_MACROS
+  #define __STDC_LIMIT_MACROS
+  #include <stdint.h>
+  #define GOT_TYPES
 #endif
-#ifdef NEED_STDINT_GCC
-#include <stdint-gcc.h>
-#endif //NEED_STDINT_GCC
-#ifdef HAVE_INTTYPES_H
+  #ifdef NEED_STDINT_GCC
+    #include <stdint-gcc.h>
+    #endif //NEED_STDINT_GCC
+    #ifdef HAVE_INTTYPES_H
 	#define __STDC_FORMAT_MACROS
 	#include <inttypes.h>
 	#define GOT_TYPES
-#ifndef SCNu8
-#define SCNu8 "u"
-#endif
+    #ifndef SCNu8
+    #define SCNu8 "u"
+  #endif
 #endif
 
 #ifndef GOT_TYPES
@@ -71,4 +69,3 @@
 #define ADM_OK 	1
 #define ADM_IGN 2
 
-#endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/include/ADM_misc.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/include/ADM_misc.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/src/ADM_benchmark.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_benchmark.cpp Changed

avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_crashdump_vs.cpp Added

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/src/ADM_fileio.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_fileio.cpp Changed

@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <dirent.h>
+//#include <dirent.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <string>
@@ -96,7 +96,7 @@
 */
 uint8_t    clearDirectoryContent(const uint32_t nb, char *jobName[])
 {
-    for(int i=0;i<nb;i++)
+    for(int i=0;i<(int)nb;i++)
         if(jobName[i])
         {
             ADM_dealloc(jobName[i]);
@@ -156,7 +156,7 @@
     uint8_t buffer[1024];
     while(!feof(fin))
     {
-        int r=fread(buffer,1,1024,fin);
+        int r=(int)fread(buffer,1,1024,fin);
         fwrite(buffer,1,r,fout);
         if(r!=1024) break;
     }
@@ -173,16 +173,16 @@
 char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3)
 {
 	char *result;
-	int length = strlen(base0) + 2;
+	int length = (int)strlen(base0) + 2;
 
 	if (base1)
-		length += strlen(base1) + 1;
+		length += (int)strlen(base1) + 1;
 
 	if (base2)
-		length += strlen(base2) + 1;
+		length += (int)strlen(base2) + 1;
 
 	if (base3)
-		length += strlen(base3) + 1;
+		length += (int)strlen(base3) + 1;
 
 	result = (char *)new char[length];
 	strcpy(result, base0);
@@ -282,7 +282,7 @@
 	bool portableMode = false;
     std::string mySelf=argv[0];
     // if the name ends by "_portable.exe" => portable
-    int match=mySelf.find("portable");
+    int match=(int)mySelf.find("portable");
     if(match!=-1)
     {
         ADM_info("Portable mode\n");

avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_folder_mingw.cpp Added

@@ -0,0 +1,355 @@
+/***************************************************************************
+
+    copyright            : (C) 2006 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <dirent.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <string>
+#include <io.h>
+#include <direct.h>
+#include <shlobj.h>
+#include "ADM_win32.h"
+
+#include "ADM_default.h"
+
+extern void simplify_path(char **buf);
+char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
+static char ADM_basedir[1024] = {0};
+static char *ADM_autodir = NULL;
+static char *ADM_systemPluginSettings=NULL;
+
+
+#undef fread
+#undef fwrite
+#undef fopen
+#undef fclose
+
+static void AddSeparator(char *path)
+{
+	if (path && (strlen(path) < strlen(ADM_SEPARATOR) || strncmp(path + strlen(path) - strlen(ADM_SEPARATOR), ADM_SEPARATOR, strlen(ADM_SEPARATOR)) != 0))
+		strcat(path, ADM_SEPARATOR);
+}
+
+
+char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3)
+{
+
+	wchar_t wcModuleName[MAX_PATH];
+
+	GetModuleFileNameW(0, wcModuleName, sizeof(wcModuleName) / sizeof(wchar_t));
+
+	int len = wideCharStringToUtf8(wcModuleName, -1, NULL);
+	char *moduleName = new char[len];
+
+	wideCharStringToUtf8(wcModuleName, -1, moduleName);
+
+	char *slash = strrchr(moduleName, '\\');
+
+	if (slash)
+		*slash = '\0';
+
+	char *relativePath = ADM_getRelativePath(moduleName, base1, base2, base3);
+
+	delete [] moduleName;
+
+	return relativePath;
+}
+
+//--- 8< 8< 8<
+
+#	include <io.h>
+#	include <direct.h>
+#	include <shlobj.h>
+#	include <fcntl.h>
+#	include "ADM_win32.h"
+
+
+/**
+    \fn ADM_fopen
+    \brief utf8 aware fopen, so that we can use utf8 string even on win32
+*/
+FILE *ADM_fopen(const char *file, const char *mode)
+{
+
+	// Override fopen to handle Unicode filenames and to ensure exclusive access when initially writing to a file.
+	int fileNameLength = utf8StringToWideChar(file, -1, NULL);
+	wchar_t *wcFile = new wchar_t[fileNameLength];
+	int creation = 0, access = 0;
+	HANDLE hFile;
+
+	utf8StringToWideChar(file, -1, wcFile);
+
+	while (true)
+	{
+		if (strchr(mode, 'w'))
+		{
+			creation = CREATE_ALWAYS;
+			access = GENERIC_WRITE;
+
+			if (strchr(mode, '+'))
+				access |= GENERIC_READ;
+		}
+		else if (strchr(mode, 'r'))
+		{
+			creation = OPEN_EXISTING;
+			access = GENERIC_READ;
+
+			if (strchr(mode, '+'))
+				access = GENERIC_WRITE;
+		}
+		else if (strchr(mode, 'a'))
+		{
+			creation = OPEN_ALWAYS;
+			access = GENERIC_WRITE;
+
+			if (strchr(mode, '+'))
+				access |= GENERIC_READ;
+		}
+
+		if (creation & GENERIC_WRITE)
+		{
+			hFile = CreateFileW(wcFile, access, 0, NULL, creation, 0, NULL);
+
+			if (hFile == INVALID_HANDLE_VALUE)
+				break;
+			else
+				CloseHandle(hFile);
+		}
+
+		hFile = CreateFileW(wcFile, access, FILE_SHARE_READ, NULL, creation, 0, NULL);
+		break;
+	}
+
+	delete [] wcFile;
+
+	if (hFile == INVALID_HANDLE_VALUE)
+		return NULL;
+	else
+		return _fdopen(_open_osfhandle((intptr_t)hFile, 0), mode);
+}
+
+
+extern "C"
+{
+	// libavformat uses open (in the file_open function) so we need to override that too.
+	// Following the same rules as ADM_fopen.
+	int ADM_open(const char *path, int oflag, ...)
+	{
+		int fileNameLength = utf8StringToWideChar(path, -1, NULL);
+		wchar_t *wcFile = new wchar_t[fileNameLength];
+		int creation = 0, access = 0;
+		HANDLE hFile;
+
+		utf8StringToWideChar(path, -1, wcFile);
+
+		delete [] wcFile;
+
+		if (oflag & O_WRONLY || oflag & O_RDWR)
+		{
+			access = GENERIC_WRITE;
+
+			if (oflag & O_RDWR)
+				access |= GENERIC_READ;
+
+			if (oflag & O_CREAT)
+			{
+				if (oflag & O_EXCL)
+					creation = CREATE_NEW;
+				else if (oflag & O_TRUNC)
+					creation = CREATE_ALWAYS;
+				else
+					creation = OPEN_ALWAYS;
+			}
+			else if (oflag & O_TRUNC)
+				creation = TRUNCATE_EXISTING;
+		}
+		else if (oflag & O_RDONLY)
+			creation = OPEN_EXISTING;
+
+		if (creation & GENERIC_WRITE)
+		{
+			hFile = CreateFileW(wcFile, access, 0, NULL, creation, 0, NULL);
+
+			if (hFile == INVALID_HANDLE_VALUE)
+				return -1;
+			else
+				CloseHandle(hFile);
+		}
+
+		hFile = CreateFileW(wcFile, access, FILE_SHARE_READ, NULL, creation, 0, NULL);
+
+		if (hFile == INVALID_HANDLE_VALUE)
+			return -1;
+		else
+			return _open_osfhandle((intptr_t)hFile, oflag);
+	}
+}
+
+
+
+#define DIR _WDIR
+#define dirent _wdirent
+#define opendir _wopendir
+#define readdir _wreaddir
+#define closedir _wclosedir
+
+/*----------------------------------------
+      Create a directory
+      If it already exists, do nothing
+------------------------------------------*/
+uint8_t ADM_mkdir(const char *dirname)
+{
+	DIR *dir = NULL;
+	uint8_t retVal = 0;
+
+
+	int dirNameLength = utf8StringToWideChar(dirname, -1, NULL);
+	wchar_t *dirname2 = new wchar_t[dirNameLength];
+
+	utf8StringToWideChar(dirname, -1, dirname2);
+
+	while (true)
+	{
+		// Check it already exists ?
+		dir = opendir(dirname2);
+
+		if (dir)
+		{
+			printf("Directory %s exists.Good.\n", dirname);
+			closedir(dir);
+
+			retVal = 1;
+			break;
+		}
+
+		if (_wmkdir(dirname2))
+		{
+			printf("Oops: mkdir failed on %s\n", dirname);
+			break;
+		}
+
+		if ((dir = opendir(dirname2)) == NULL)
+			break;
+
+		closedir(dir);
+
+		retVal = 1;
+
+		break;
+	}
+
+
+	delete [] dirname2;
+
+	return retVal;
+}
+/**
+ *  \fn buildDirectoryContent
+ * 	\brief Returns the content of a dir with the extension ext. The receiving array must be allocated by caller
+ * (just the array, not the names themselves)
+ */
+uint8_t buildDirectoryContent(uint32_t *outnb, const char *base, char *jobName[], int maxElems, const char *ext)
+{
+	DIR *dir;
+	struct dirent *direntry;
+	int dirmax = 0, len;
+	int extlen = strlen(ext);
+
+	ADM_assert(extlen);
+
+
+	int dirNameLength = utf8StringToWideChar(base, -1, NULL);
+	wchar_t *base2 = new wchar_t[dirNameLength];
+
+	utf8StringToWideChar(base, -1, base2);
+
+	dir = opendir(base2);
+
+
+	delete [] base2;
+
+	if (!dir)
+	{
+		return 0;
+	}
+
+
+	char *d_name = NULL;
+
+	while ((direntry = readdir(dir)))
+	{
+		delete [] d_name;
+
+		int dirLength = wideCharStringToUtf8(direntry->d_name, -1, NULL);
+		d_name = new char[dirLength];
+
+		wideCharStringToUtf8(direntry->d_name, -1, d_name);
+
+		len = strlen(d_name);
+
+		if (len < (extlen + 1))
+			continue;
+
+		int xbase = len - extlen;
+
+		if (memcmp(d_name + xbase, ext, extlen))
+		{
+			printf("ignored: %s\n", d_name);
+			continue;
+		}
+
+		jobName[dirmax] = (char *)ADM_alloc(strlen(base) + strlen(d_name) + 2);
+		strcpy(jobName[dirmax], base);
+		AddSeparator(jobName[dirmax]);
+		strcat(jobName[dirmax], d_name);
+		dirmax++;
+
+		if (dirmax >= maxElems)
+		{
+			printf("[jobs]: Max # of jobs exceeded\n");
+			break;
+		}
+	}
+
+
+	delete [] d_name;
+
+	closedir(dir);
+	*outnb = dirmax;
+
+	return 1;
+}
+
+/**
+    \fn ADM_copyFile
+*/
+uint8_t ADM_renameFile(const char *source, const char *target)
+{
+
+    int sourceFileNameLength = utf8StringToWideChar(source, -1, NULL);
+    int targetFileNameLength = utf8StringToWideChar(target, -1, NULL);
+    wchar_t wcFileSource[sourceFileNameLength];
+    wchar_t wcFileTarget[targetFileNameLength];
+
+    utf8StringToWideChar(source, -1, wcFileSource);
+    utf8StringToWideChar(target, -1, wcFileTarget);
+
+    if(!_wrename(wcFileSource,wcFileTarget)) return true;
+    ADM_error("Failed to rename %s to %s\n",source,target);
+    return false;
+}
+
+
+// EOF

avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_folder_vs.cpp Added

@@ -0,0 +1,301 @@
+ /***************************************************************************
+
+     copyright            : (C) 2016 by mean
+     email                : fixounet@free.fr
+  ***************************************************************************/
+
+ /***************************************************************************
+  *                                                                         *
+  *   This program is free software; you can redistribute it and/or modify  *
+  *   it under the terms of the GNU General Public License as published by  *
+  *   the Free Software Foundation; either version 2 of the License, or     *
+  *   (at your option) any later version.                                   *
+  *                                                                         *
+  ***************************************************************************/
+
+
+ #include <errno.h>
+ #include <string>
+ #include <io.h>
+ #include <direct.h>
+ #include <shlobj.h>
+ #include <fcntl.h>
+ #include "ADM_win32.h"
+ #include "ADM_default.h"
+
+char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
+
+ #undef fread
+ #undef fwrite
+ #undef fopen
+ #undef fclose
+
+ char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3)
+ {
+
+ 	wchar_t wcModuleName[MAX_PATH];
+
+ 	GetModuleFileNameW(0, wcModuleName, sizeof(wcModuleName) / sizeof(wchar_t));
+
+ 	int len = wideCharStringToUtf8(wcModuleName, -1, NULL);
+ 	char *moduleName = new char[len];
+
+ 	wideCharStringToUtf8(wcModuleName, -1, moduleName);
+
+ 	char *slash = strrchr(moduleName, '\\');
+
+ 	if (slash)
+ 		*slash = '\0';
+
+ 	char *relativePath = ADM_getRelativePath(moduleName, base1, base2, base3);
+
+ 	delete [] moduleName;
+
+ 	return relativePath;
+ }
+
+
+
+ /**
+     \fn ADM_fopen
+     \brief utf8 aware fopen, so that we can use utf8 string even on win32
+ */
+ FILE *ADM_fopen(const char *file, const char *mode)
+ {
+
+ 	// Override fopen to handle Unicode filenames and to ensure exclusive access when initially writing to a file.
+ 	int fileNameLength = utf8StringToWideChar(file, -1, NULL);
+ 	wchar_t *wcFile = new wchar_t[fileNameLength];
+ 	int creation = 0, access = 0;
+ 	HANDLE hFile;
+
+ 	utf8StringToWideChar(file, -1, wcFile);
+
+ 	while (true)
+ 	{
+ 		if (strchr(mode, 'w'))
+ 		{
+ 			creation = CREATE_ALWAYS;
+ 			access = GENERIC_WRITE;
+
+ 			if (strchr(mode, '+'))
+ 				access |= GENERIC_READ;
+ 		}
+ 		else if (strchr(mode, 'r'))
+ 		{
+ 			creation = OPEN_EXISTING;
+ 			access = GENERIC_READ;
+
+ 			if (strchr(mode, '+'))
+ 				access = GENERIC_WRITE;
+ 		}
+ 		else if (strchr(mode, 'a'))
+ 		{
+ 			creation = OPEN_ALWAYS;
+ 			access = GENERIC_WRITE;
+
+ 			if (strchr(mode, '+'))
+ 				access |= GENERIC_READ;
+ 		}
+
+ 		if (creation & GENERIC_WRITE)
+ 		{
+ 			hFile = CreateFileW(wcFile, access, 0, NULL, creation, 0, NULL);
+
+ 			if (hFile == INVALID_HANDLE_VALUE)
+ 				break;
+ 			else
+ 				CloseHandle(hFile);
+ 		}
+
+ 		hFile = CreateFileW(wcFile, access, FILE_SHARE_READ, NULL, creation, 0, NULL);
+ 		break;
+ 	}
+
+ 	delete [] wcFile;
+
+ 	if (hFile == INVALID_HANDLE_VALUE)
+ 		return NULL;
+ 	else
+ 		return _fdopen(_open_osfhandle((intptr_t)hFile, 0), mode);
+ }
+
+
+ extern "C"
+ {
+ 	// libavformat uses open (in the file_open function) so we need to override that too.
+ 	// Following the same rules as ADM_fopen.
+ 	int ADM_open(const char *path, int oflag, ...)
+ 	{
+ 		int fileNameLength = utf8StringToWideChar(path, -1, NULL);
+ 		wchar_t *wcFile = new wchar_t[fileNameLength];
+ 		int creation = 0, access = 0;
+ 		HANDLE hFile;
+
+ 		utf8StringToWideChar(path, -1, wcFile);
+
+ 		delete [] wcFile;
+
+ 		if (oflag & O_WRONLY || oflag & O_RDWR)
+ 		{
+ 			access = GENERIC_WRITE;
+
+ 			if (oflag & O_RDWR)
+ 				access |= GENERIC_READ;
+
+ 			if (oflag & O_CREAT)
+ 			{
+ 				if (oflag & O_EXCL)
+ 					creation = CREATE_NEW;
+ 				else if (oflag & O_TRUNC)
+ 					creation = CREATE_ALWAYS;
+ 				else
+ 					creation = OPEN_ALWAYS;
+ 			}
+ 			else if (oflag & O_TRUNC)
+ 				creation = TRUNCATE_EXISTING;
+ 		}
+ 		else if (oflag & O_RDONLY)
+ 			creation = OPEN_EXISTING;
+
+ 		if (creation & GENERIC_WRITE)
+ 		{
+ 			hFile = CreateFileW(wcFile, access, 0, NULL, creation, 0, NULL);
+
+ 			if (hFile == INVALID_HANDLE_VALUE)
+ 				return -1;
+ 			else
+ 				CloseHandle(hFile);
+ 		}
+
+ 		hFile = CreateFileW(wcFile, access, FILE_SHARE_READ, NULL, creation, 0, NULL);
+
+ 		if (hFile == INVALID_HANDLE_VALUE)
+ 			return -1;
+ 		else
+ 			return _open_osfhandle((intptr_t)hFile, oflag);
+ 	}
+ }
+
+
+ /*----------------------------------------
+       Create a directory
+       If it already exists, do nothing
+ ------------------------------------------*/
+ uint8_t ADM_mkdir(const char *dirname)
+ {
+
+    int dirNameLength = utf8StringToWideChar(dirname, -1, NULL);
+    wchar_t *dirname2 = new wchar_t[dirNameLength];
+    utf8StringToWideChar(dirname, -1, dirname2);
+    int er = _wmkdir(dirname2);
+    delete[] dirname2;
+    uint8_t retVal = 0;
+
+
+    if (er != -1)
+        retVal = true;
+    else
+    {
+        if (errno == EEXIST)
+            retVal = true;
+        else
+        {
+            ADM_warning("Failed to create folder %s with error %d\n", dirname, errno);
+            retVal = false;
+        }
+    }
+
+ 	
+ 	return retVal;
+ }
+ 
+
+
+  // Convert string from Wide Char to ANSI code page
+ static int wideCharStringToAnsi(const wchar_t *wideCharString, int wideCharStringLength, char *ansiString, const char *filler)
+ {
+     int flags = WC_COMPOSITECHECK;
+
+     if (filler)
+         flags |= WC_NO_BEST_FIT_CHARS | WC_DEFAULTCHAR;
+
+     int ansiStringLen = WideCharToMultiByte(CP_ACP, flags, wideCharString, wideCharStringLength, NULL, 0, filler, NULL);
+
+     if (ansiString)
+         WideCharToMultiByte(CP_ACP, flags, wideCharString, wideCharStringLength, ansiString, ansiStringLen, filler, NULL);
+
+     return ansiStringLen;
+ }
+ /**
+ *  \fn buildDirectoryContent
+ * 	\brief Returns the content of a dir with the extension ext. The receiving array must be allocated by caller
+ * (just the array, not the names themselves)
+ */
+ uint8_t buildDirectoryContent(uint32_t *outnb, const char *base, char *jobName[], int maxElems, const char *ext)
+ {
+
+    std::string joker = std::string(base) + std::string("/*.") + std::string(ext);
+ 	int dirNameLength = utf8StringToWideChar(joker.c_str(), -1, NULL);
+ 	wchar_t *base2 = new wchar_t[dirNameLength];
+    utf8StringToWideChar(joker.c_str(), -1, base2);
+    int dirmax = 0;
+//--
+    HANDLE hFind;
+    WIN32_FIND_DATAW FindFileData;
+
+    hFind = FindFirstFileW(base2,&FindFileData);
+    if(hFind == INVALID_HANDLE_VALUE)
+    {
+        ADM_warning("Cannot list content of %s\n", base);
+        delete[] base2;
+        *outnb = 0;
+        return true;
+    }
+
+    do 
+    {
+        WCHAR *wname = FindFileData.cFileName;
+        //int wideCharStringToAnsi(const wchar_t *wideCharString, int wideCharStringLength, char *ansiString, const char *filler)
+        int nameLength = wideCharStringToAnsi(wname, -1, NULL, "?");       
+        char *shortName = new char[nameLength];
+        nameLength = wideCharStringToAnsi(wname, -1, shortName, "?");
+        std::string item = std::string(base) + std::string("/") + std::string(shortName);
+        delete[] shortName;
+
+        int targetLength = item.length();
+        jobName[dirmax] = (char *)ADM_alloc(targetLength);
+        strcpy(jobName[dirmax], item.c_str());
+        dirmax++;
+        if (dirmax > maxElems)
+            break;
+            
+    } while (FindNextFileW(hFind, &FindFileData));
+    FindClose(hFind);
+    
+    *outnb = dirmax;
+
+    delete[] base2;
+    return true;
+ }
+
+ /**
+     \fn ADM_copyFile
+ */
+ uint8_t ADM_renameFile(const char *source, const char *target)
+ {
+
+     int sourceFileNameLength = utf8StringToWideChar(source, -1, NULL);
+     int targetFileNameLength = utf8StringToWideChar(target, -1, NULL);
+     wchar_t *wcFileSource=(wchar_t*)_alloca(sourceFileNameLength*sizeof(wchar_t));
+     wchar_t *wcFileTarget= (wchar_t*)_alloca(targetFileNameLength * sizeof(wchar_t));
+
+     utf8StringToWideChar(source, -1, wcFileSource);
+     utf8StringToWideChar(target, -1, wcFileTarget);
+
+     if(!_wrename(wcFileSource,wcFileTarget)) return true;
+     ADM_error("Failed to rename %s to %s\n",source,target);
+     return false;
+ }
+
+// EOF

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/src/ADM_folder_win32.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_folder_win32.cpp Changed

@@ -13,9 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <dirent.h>
+
 #include <errno.h>
-#include <sys/stat.h>
 #include <string>
 #include <io.h>
 #include <direct.h>
@@ -76,29 +75,6 @@
 	return ADM_getRelativePath(ADM_getBaseDir(), base1, base2, base3);
 }
 
-char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3)
-{
-
-	wchar_t wcModuleName[MAX_PATH];
-
-	GetModuleFileNameW(0, wcModuleName, sizeof(wcModuleName) / sizeof(wchar_t));
-
-	int len = wideCharStringToUtf8(wcModuleName, -1, NULL);
-	char *moduleName = new char[len];
-
-	wideCharStringToUtf8(wcModuleName, -1, moduleName);
-
-	char *slash = strrchr(moduleName, '\\');
-
-	if (slash)
-		*slash = '\0';
-
-	char *relativePath = ADM_getRelativePath(moduleName, base1, base2, base3);
-
-	delete [] moduleName;
-
-	return relativePath;
-}
 
 /*
       Get the root directory for .avidemux stuff
@@ -225,261 +201,7 @@
 		}
 	}
 }
-/**
-    \fn ADM_fopen
-    \brief utf8 aware fopen, so that we can use utf8 string even on win32
-*/
-FILE *ADM_fopen(const char *file, const char *mode)
-{
-
-	// Override fopen to handle Unicode filenames and to ensure exclusive access when initially writing to a file.
-	int fileNameLength = utf8StringToWideChar(file, -1, NULL);
-	wchar_t *wcFile = new wchar_t[fileNameLength];
-	int creation = 0, access = 0;
-	HANDLE hFile;
-
-	utf8StringToWideChar(file, -1, wcFile);
-
-	while (true)
-	{
-		if (strchr(mode, 'w'))
-		{
-			creation = CREATE_ALWAYS;
-			access = GENERIC_WRITE;
-
-			if (strchr(mode, '+'))
-				access |= GENERIC_READ;
-		}
-		else if (strchr(mode, 'r'))
-		{
-			creation = OPEN_EXISTING;
-			access = GENERIC_READ;
-
-			if (strchr(mode, '+'))
-				access = GENERIC_WRITE;
-		}
-		else if (strchr(mode, 'a'))
-		{
-			creation = OPEN_ALWAYS;
-			access = GENERIC_WRITE;
-
-			if (strchr(mode, '+'))
-				access |= GENERIC_READ;
-		}
-
-		if (creation & GENERIC_WRITE)
-		{
-			hFile = CreateFileW(wcFile, access, 0, NULL, creation, 0, NULL);
-
-			if (hFile == INVALID_HANDLE_VALUE)
-				break;
-			else
-				CloseHandle(hFile);
-		}
-
-		hFile = CreateFileW(wcFile, access, FILE_SHARE_READ, NULL, creation, 0, NULL);
-		break;
-	}
-
-	delete [] wcFile;
-
-	if (hFile == INVALID_HANDLE_VALUE)
-		return NULL;
-	else
-		return _fdopen(_open_osfhandle((intptr_t)hFile, 0), mode);
-}
-
-
-extern "C"
-{
-	// libavformat uses open (in the file_open function) so we need to override that too.
-	// Following the same rules as ADM_fopen.
-	int ADM_open(const char *path, int oflag, ...)
-	{
-		int fileNameLength = utf8StringToWideChar(path, -1, NULL);
-		wchar_t *wcFile = new wchar_t[fileNameLength];
-		int creation = 0, access = 0;
-		HANDLE hFile;
-
-		utf8StringToWideChar(path, -1, wcFile);
-
-		delete [] wcFile;
-
-		if (oflag & O_WRONLY || oflag & O_RDWR)
-		{
-			access = GENERIC_WRITE;
-
-			if (oflag & O_RDWR)
-				access |= GENERIC_READ;
-
-			if (oflag & O_CREAT)
-			{
-				if (oflag & O_EXCL)
-					creation = CREATE_NEW;
-				else if (oflag & O_TRUNC)
-					creation = CREATE_ALWAYS;
-				else
-					creation = OPEN_ALWAYS;
-			}
-			else if (oflag & O_TRUNC)
-				creation = TRUNCATE_EXISTING;
-		}
-		else if (oflag & O_RDONLY)
-			creation = OPEN_EXISTING;
-
-		if (creation & GENERIC_WRITE)
-		{
-			hFile = CreateFileW(wcFile, access, 0, NULL, creation, 0, NULL);
-
-			if (hFile == INVALID_HANDLE_VALUE)
-				return -1;
-			else
-				CloseHandle(hFile);
-		}
-
-		hFile = CreateFileW(wcFile, access, FILE_SHARE_READ, NULL, creation, 0, NULL);
-
-		if (hFile == INVALID_HANDLE_VALUE)
-			return -1;
-		else
-			return _open_osfhandle((intptr_t)hFile, oflag);
-	}
-}
-
-
-
-#define DIR _WDIR
-#define dirent _wdirent
-#define opendir _wopendir
-#define readdir _wreaddir
-#define closedir _wclosedir
-
-/*----------------------------------------
-      Create a directory
-      If it already exists, do nothing
-------------------------------------------*/
-uint8_t ADM_mkdir(const char *dirname)
-{
-	DIR *dir = NULL;
-	uint8_t retVal = 0;
-
-
-	int dirNameLength = utf8StringToWideChar(dirname, -1, NULL);
-	wchar_t *dirname2 = new wchar_t[dirNameLength];
-
-	utf8StringToWideChar(dirname, -1, dirname2);
-
-	while (true)
-	{
-		// Check it already exists ?
-		dir = opendir(dirname2);
-
-		if (dir)
-		{
-			printf("Directory %s exists.Good.\n", dirname);
-			closedir(dir);
-
-			retVal = 1;
-			break;
-		}
-
-		if (_wmkdir(dirname2))
-		{
-			printf("Oops: mkdir failed on %s\n", dirname);
-			break;
-		}
-
-		if ((dir = opendir(dirname2)) == NULL)
-			break;
-
-		closedir(dir);
-
-		retVal = 1;
-
-		break;
-	}
-
-
-	delete [] dirname2;
-
-	return retVal;
-}
-/**
- *  \fn buildDirectoryContent
- * 	\brief Returns the content of a dir with the extension ext. The receiving array must be allocated by caller
- * (just the array, not the names themselves)
- */
-uint8_t buildDirectoryContent(uint32_t *outnb, const char *base, char *jobName[], int maxElems, const char *ext)
-{
-	DIR *dir;
-	struct dirent *direntry;
-	int dirmax = 0, len;
-	int extlen = strlen(ext);
-
-	ADM_assert(extlen);
-
-
-	int dirNameLength = utf8StringToWideChar(base, -1, NULL);
-	wchar_t *base2 = new wchar_t[dirNameLength];
-
-	utf8StringToWideChar(base, -1, base2);
-
-	dir = opendir(base2);
-
-
-	delete [] base2;
-
-	if (!dir)
-	{
-		return 0;
-	}
-
-
-	char *d_name = NULL;
-
-	while ((direntry = readdir(dir)))
-	{
-		delete [] d_name;
-
-		int dirLength = wideCharStringToUtf8(direntry->d_name, -1, NULL);
-		d_name = new char[dirLength];
-
-		wideCharStringToUtf8(direntry->d_name, -1, d_name);
 
-		len = strlen(d_name);
-
-		if (len < (extlen + 1))
-			continue;
-
-		int xbase = len - extlen;
-
-		if (memcmp(d_name + xbase, ext, extlen))
-		{
-			printf("ignored: %s\n", d_name);
-			continue;
-		}
-
-		jobName[dirmax] = (char *)ADM_alloc(strlen(base) + strlen(d_name) + 2);
-		strcpy(jobName[dirmax], base);
-		AddSeparator(jobName[dirmax]);
-		strcat(jobName[dirmax], d_name);
-		dirmax++;
-
-		if (dirmax >= maxElems)
-		{
-			printf("[jobs]: Max # of jobs exceeded\n");
-			break;
-		}
-	}
-
-
-	delete [] d_name;
-
-	closedir(dir);
-	*outnb = dirmax;
-
-	return 1;
-}
 
 /**
         \fn ADM_PathCanonize
@@ -561,7 +283,7 @@
     size_t idx2=str.find_last_of ("/");
 
 
-    // no / nor \  
+    // no / nor \
 
     if(idx2==std::string::npos && idx==std::string::npos)
         return str;
@@ -578,24 +300,5 @@
     return str.substr(idx+1);
 }
 
-/**
-    \fn ADM_copyFile
-*/
-uint8_t ADM_renameFile(const char *source, const char *target)
-{
-
-    int sourceFileNameLength = utf8StringToWideChar(source, -1, NULL);
-    int targetFileNameLength = utf8StringToWideChar(target, -1, NULL);
-    wchar_t wcFileSource[sourceFileNameLength];
-    wchar_t wcFileTarget[targetFileNameLength];
-
-    utf8StringToWideChar(source, -1, wcFileSource);
-    utf8StringToWideChar(target, -1, wcFileTarget);
-
-    if(!_wrename(wcFileSource,wcFileTarget)) return true;
-    ADM_error("Failed to rename %s to %s\n",source,target);
-    return false;
-}
-
 
 // EOF

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/src/ADM_memsupport.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_memsupport.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/src/ADM_misc.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_misc.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/src/ADM_nvwa/debug_new.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_nvwa/debug_new.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/src/ADM_win32.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_win32.cpp Changed

@@ -401,63 +401,6 @@
     return true;
 }
 
-void redirectStdoutToFile(void)
-{
-    // Don't redirect stdout and stderr if SDL hasn't already hijacked it.
-    // This allows us to optionally compile all EXEs as console applications
-    // so the output can be printed to the terminal for debugging purposes.
-
-     // Close SDL generated logs and briefly redirect to NUL
-     freopen("NUL", "w", stdout);
-     freopen("NUL", "w", stderr);
-
-    // Remove SDL logs to avoid confusion
-    char path[MAX_PATH];
-    char stdoutPath[MAX_PATH];
-    char stderrPath[MAX_PATH];
-    DWORD pathlen = GetModuleFileName(NULL, path, MAX_PATH);
-
-    while (pathlen > 0 && path[pathlen] != '\\')
-        pathlen--;
-
-    path[pathlen] = '\0';
-
-    strcpy(stdoutPath, path);
-    strcat(stdoutPath, "\\stdout.txt");
-    strcpy(stderrPath, path);
-    strcat(stderrPath, "\\stderr.txt");
-
-    remove(stdoutPath);
-    remove(stderrPath);
-
-    // Redirect output to log file in the user's profile directory
-    const char* logFile = "admlog.txt";
-    const char* baseDir = ADM_getBaseDir();
-    char *logPath = new char[strlen(baseDir) + strlen(logFile) + 1];
-
-    strcpy(logPath, baseDir);
-    strcat(logPath, logFile);
-
-    FILE *stream = fopen(logPath, "w");
-
-    if (stream)
-    {
-        fclose(stdout);
-        fclose(stderr);
-
-        *stdout = *stream;
-        *stderr = *stream;
-    }
-
-    // Line buffering
-    setvbuf(stdout, NULL, _IONBF, BUFSIZ);
-    setvbuf(stderr, NULL, _IONBF, BUFSIZ);
-
-    _setmode(_fileno(stdout), _O_TEXT);
-    _setmode(_fileno(stderr), _O_TEXT);
-
-    delete[] logPath;
-}
 
 // Convert string from ANSI code page to wide char
 int ansiStringToWideChar(const char *ansiString, int ansiStringLength, wchar_t *wideCharString)
@@ -498,10 +441,10 @@
 
 static int utf8_to_wc(const char *in, wchar_t **out)
 {
-      int dirLength= utf8StringToWideChar(in, strlen(in), NULL) + 1;
+      int dirLength= (int)utf8StringToWideChar(in, strlen(in), NULL) + 1;
       wchar_t *wcDirectory=new wchar_t[dirLength];
       memset(wcDirectory,0,dirLength*sizeof(wchar_t));
-      utf8StringToWideChar(in, strlen(in),wcDirectory);
+      utf8StringToWideChar(in, (int)strlen(in),wcDirectory);
       *out=wcDirectory;
       return dirLength;
 }
@@ -542,8 +485,8 @@
 
 
 
-    int filenameLength = fileName.size();
-    int directoryLength = pathName.size();
+    int filenameLength = (int)fileName.size();
+    int directoryLength = (int)pathName.size();
 
     printf("Path=%s\n",pathName.c_str());
     printf("Name=%s\n",fileName.c_str());

avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_win32_mingw.cpp Added

@@ -0,0 +1,69 @@
+#include <winsock2.h>
+#include <windows.h>
+#include <fcntl.h>
+#include <io.h>
+#include <string>
+#include <winnls.h>
+
+#include "ADM_default.h"
+#include "ADM_win32.h"
+#include "ADM_misc.h"
+#include <algorithm>
+
+void redirectStdoutToFile(void)
+{
+    // Don't redirect stdout and stderr if SDL hasn't already hijacked it.
+    // This allows us to optionally compile all EXEs as console applications
+    // so the output can be printed to the terminal for debugging purposes.
+
+     // Close SDL generated logs and briefly redirect to NUL
+     freopen("NUL", "w", stdout);
+     freopen("NUL", "w", stderr);
+
+    // Remove SDL logs to avoid confusion
+    char path[MAX_PATH];
+    char stdoutPath[MAX_PATH];
+    char stderrPath[MAX_PATH];
+    DWORD pathlen = GetModuleFileName(NULL, path, MAX_PATH);
+
+    while (pathlen > 0 && path[pathlen] != '\\')
+        pathlen--;
+
+    path[pathlen] = '\0';
+
+    strcpy(stdoutPath, path);
+    strcat(stdoutPath, "\\stdout.txt");
+    strcpy(stderrPath, path);
+    strcat(stderrPath, "\\stderr.txt");
+
+    remove(stdoutPath);
+    remove(stderrPath);
+
+    // Redirect output to log file in the user's profile directory
+    const char* logFile = "admlog.txt";
+    const char* baseDir = ADM_getBaseDir();
+    char *logPath = new char[strlen(baseDir) + strlen(logFile) + 1];
+
+    strcpy(logPath, baseDir);
+    strcat(logPath, logFile);
+
+    FILE *stream = fopen(logPath, "w");
+
+    if (stream)
+    {
+        fclose(stdout);
+        fclose(stderr);
+
+        *stdout = *stream;
+        *stderr = *stream;
+    }
+
+    // Line buffering
+    setvbuf(stdout, NULL, _IONBF, BUFSIZ);
+    setvbuf(stderr, NULL, _IONBF, BUFSIZ);
+
+    _setmode(_fileno(stdout), _O_TEXT);
+    _setmode(_fileno(stderr), _O_TEXT);
+
+    delete[] logPath;
+}

avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/ADM_win32_vs.cpp Added

@@ -0,0 +1,48 @@
+#include <winsock2.h>
+#include <windows.h>
+#include <fcntl.h>
+#include <io.h>
+#include <string>
+#include <winnls.h>
+
+#include "ADM_default.h"
+#include "ADM_win32.h"
+#include "ADM_misc.h"
+#include <algorithm>
+void redirectStdoutToFile(void)
+{
+    // Don't redirect stdout and stderr if SDL hasn't already hijacked it.
+    // This allows us to optionally compile all EXEs as console applications
+    // so the output can be printed to the terminal for debugging purposes.
+
+     // Close SDL generated logs and briefly redirect to NUL
+     //freopen("NUL", "w", stdout);
+     //freopen("NUL", "w", stderr);
+
+    // Remove SDL logs to avoid confusion
+    char path[MAX_PATH];
+    char stdoutPath[MAX_PATH];
+    char stderrPath[MAX_PATH];
+    DWORD pathlen = GetModuleFileName(NULL, path, MAX_PATH);
+
+    while (pathlen > 0 && path[pathlen] != '\\')
+        pathlen--;
+
+    path[pathlen] = '\0';
+
+    strcpy(stdoutPath, path);
+    strcat(stdoutPath, "\\stdout.txt");
+    strcpy(stderrPath, path);
+    strcat(stderrPath, "\\stderr.txt");
+
+    remove(stdoutPath);
+    remove(stderrPath);
+
+    // Redirect output to log file in the user's profile directory
+    const char* logFile = "admlog.txt";
+
+    std::string filePath=std::string(ADM_getBaseDir())+std::string(logFile);
+
+    freopen(filePath.c_str(),"w",stdout);
+ 
+}

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/src/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_core/src/TLK_clock.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_core/src/TLK_clock.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreAudioCodec/include/ADM_ad_plugin.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreAudioCodec/include/ADM_ad_plugin.h Changed

@@ -36,35 +36,35 @@
 
 #define DECLARE_AUDIO_DECODER(Class,Major,Minor,Patch,Formats,Desc) \
 	extern "C" { \
-	ADM_Audiocodec *create(uint32_t fourcc,	WAVHeader *info,uint32_t extraLength,uint8_t *extraData)\
+	ADM_PLUGIN_EXPORT ADM_Audiocodec *create(uint32_t fourcc,	WAVHeader *info,uint32_t extraLength,uint8_t *extraData)\
 	{ \
 		return new Class(fourcc,	info,extraLength,extraData);\
 	} \
-	ADM_Audiocodec *destroy(ADM_Audiocodec *codec) \
+	ADM_PLUGIN_EXPORT ADM_Audiocodec *destroy(ADM_Audiocodec *codec) \
 	{ \
 		Class *a=(Class *)codec;\
 		delete a;\
         return NULL;\
 	}\
-	int supportedFormat(uint32_t audioFourcc) \
+	ADM_PLUGIN_EXPORT int supportedFormat(uint32_t audioFourcc) \
 	{ \
 		for(int i=0;i<sizeof(Formats)/sizeof(ad_supportedFormat);i++)\
 			if(Formats[i].fourcc==audioFourcc) \
 				return Formats[i].priority; \
 		return 0; \
 	} \
-	uint32_t getApiVersion(void)\
+	ADM_PLUGIN_EXPORT uint32_t getApiVersion(void)\
 	{\
 			return AD_API_VERSION;\
 	}\
-	bool getDecoderVersion(uint32_t *major,uint32_t *minor, uint32_t *patch)\
+	ADM_PLUGIN_EXPORT bool getDecoderVersion(uint32_t *major,uint32_t *minor, uint32_t *patch)\
 	{\
 		*major=Major;\
 		*minor=Minor;\
 		*patch=Patch;\
 		return true;\
 	}\
-	const char *getInfo(void)\
+	ADM_PLUGIN_EXPORT const char *getInfo(void)\
 	{\
 		return Desc; \
 	}\

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreAudioDevice/include/ADM_audioDeviceInternal.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreAudioDevice/include/ADM_audioDeviceInternal.h Changed

@@ -65,12 +65,12 @@
 
 #define ADM_DECLARE_AUDIODEVICE(name,Class,major,minor,patch,desc) \
 extern "C" { \
-const char *getName(void) {return #name;}\
-uint32_t getApiVersion(void) {return ADM_AUDIO_DEVICE_API_VERSION;} \
-const char *getDescriptor(void ) {return desc;} \
- audioDeviceThreaded *create(void){return new Class;} \
- void destroy(audioDeviceThreaded *z){Class *a=(Class *)z;delete a;} \
-uint8_t getVersion(uint32_t *mmajor,uint32_t *mminor,uint32_t *ppatch) \
+ADM_PLUGIN_EXPORT const char *getName(void) {return #name;}\
+ADM_PLUGIN_EXPORT uint32_t getApiVersion(void) {return ADM_AUDIO_DEVICE_API_VERSION;} \
+ADM_PLUGIN_EXPORT const char *getDescriptor(void ) {return desc;} \
+ADM_PLUGIN_EXPORT audioDeviceThreaded *create(void){return new Class;} \
+ADM_PLUGIN_EXPORT void destroy(audioDeviceThreaded *z){Class *a=(Class *)z;delete a;} \
+ADM_PLUGIN_EXPORT uint8_t getVersion(uint32_t *mmajor,uint32_t *mminor,uint32_t *ppatch) \
     {\
         *mmajor=major;\
         *mminor=minor;\

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreAudioEncoder/include/audioencoderInternal.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreAudioEncoder/include/audioencoderInternal.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_demuxerInternal.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_demuxerInternal.h Changed

@@ -68,13 +68,13 @@
 
 #define ADM_DEMUXER_BEGIN( Class,prio,maj,mn,pat,name,desc) \
 extern "C" {\
-vidHeader   *create(void){ return new Class; } \
-void         destroy(vidHeader *h){ Class *z=(Class *)h;delete z;} \
-uint8_t      getVersion(uint32_t *major,uint32_t *minor,uint32_t *patch) {*major=maj;*minor=mn;*patch=pat;return 1;} \
-uint32_t     getApiVersion(void) {return ADM_DEMUXER_API_VERSION;} \
-const char  *getName(void) {return name;} \
-const char  *getDescriptor(void) {return desc;} \
-uint32_t     getPriority(void) {return prio;} \
+ADM_PLUGIN_EXPORT vidHeader   *create(void){ return new Class; } \
+ADM_PLUGIN_EXPORT void         destroy(vidHeader *h){ Class *z=(Class *)h;delete z;} \
+ADM_PLUGIN_EXPORT uint8_t      getVersion(uint32_t *major,uint32_t *minor,uint32_t *patch) {*major=maj;*minor=mn;*patch=pat;return 1;} \
+ADM_PLUGIN_EXPORT uint32_t     getApiVersion(void) {return ADM_DEMUXER_API_VERSION;} \
+ADM_PLUGIN_EXPORT const char  *getName(void) {return name;} \
+ADM_PLUGIN_EXPORT const char  *getDescriptor(void) {return desc;} \
+ADM_PLUGIN_EXPORT uint32_t     getPriority(void) {return prio;} \
 }
 
 #endif

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/ADM_coreDemuxerMpeg6_export.h Added

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/ADM_indexFile.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/ADM_indexFile.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmxPSPacket.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmxPSPacket.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmxPacket.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmxPacket.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxer.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxer.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerEs.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerEs.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerMSDVR.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerMSDVR.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerPS.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerPS.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerTS.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerTS.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_identify.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_identify.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_indexer.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_indexer.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_io.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/dmx_io.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/CMakeLists.txt Changed

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreImageLoader/include/ADM_coreImageLoader6_export.h Added

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreImageLoader/include/ADM_imageLoader.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreImageLoader/include/ADM_imageLoader.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreImageLoader/src/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreImageLoader/src/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreMuxer/include/ADM_muxerInternal.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreMuxer/include/ADM_muxerInternal.h Changed

@@ -90,31 +90,31 @@
 		} \
 	} \
 \
-ADM_muxer   *create(void){ return new Class; } \
-void         destroy(ADM_muxer *h){ Class *z=(Class *)h;delete z;} \
-uint8_t      getVersion(uint32_t *major,uint32_t *minor,uint32_t *patch) {*major=maj;*minor=mn;*patch=pat;return 1;} \
-uint32_t     getApiVersion(void) {return ADM_MUXER_API_VERSION;} \
-const char  *getName(void) {return name;} \
-const char  *getDescriptor(void) {return desc;} \
-const char  *getDisplayName(void) { return displayName;} \
-const char  *getDefaultExtension(void) { return Ext;} \
-bool        getConfiguration(CONFcouple **conf) \
+ADM_PLUGIN_EXPORT ADM_muxer   *create(void){ return new Class; } \
+ADM_PLUGIN_EXPORT void         destroy(ADM_muxer *h){ Class *z=(Class *)h;delete z;} \
+ADM_PLUGIN_EXPORT uint8_t      getVersion(uint32_t *major,uint32_t *minor,uint32_t *patch) {*major=maj;*minor=mn;*patch=pat;return 1;} \
+ADM_PLUGIN_EXPORT uint32_t     getApiVersion(void) {return ADM_MUXER_API_VERSION;} \
+ADM_PLUGIN_EXPORT const char  *getName(void) {return name;} \
+ADM_PLUGIN_EXPORT const char  *getDescriptor(void) {return desc;} \
+ADM_PLUGIN_EXPORT const char  *getDisplayName(void) { return displayName;} \
+ADM_PLUGIN_EXPORT const char  *getDefaultExtension(void) { return Ext;} \
+ADM_PLUGIN_EXPORT bool        getConfiguration(CONFcouple **conf) \
 {\
          if(confTemplate==NULL) {*conf=NULL;return true;} \
          return ADM_paramSave(conf,confTemplate,confVar); \
 }\
-bool        setConfiguration(CONFcouple *conf)\
+ADM_PLUGIN_EXPORT bool        setConfiguration(CONFcouple *conf)\
 {\
 	snapshotDefaultConfiguration(); \
                   return ADM_paramLoad(conf,confTemplate,confVar); \
 } \
-bool        resetConfiguration() \
+ADM_PLUGIN_EXPORT bool        resetConfiguration() \
 { \
 	snapshotDefaultConfiguration(); \
 	if (defaultConfig != NULL) memcpy(confVar, defaultConfig, confSize); \
 	return true; \
 } \
- bool  configure(void) \
+ ADM_PLUGIN_EXPORT bool  configure(void) \
 { \
 	snapshotDefaultConfiguration(); \
  if(configureFunc==NULL) return true;\

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUI/include/DIA_factory.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUI/include/DIA_factory.h Changed

@@ -57,7 +57,7 @@
 #define ELEM_TYPE_FLOAT float
 
 /*********************************************/
-class diaElem
+class ADM_COREUI6_EXPORT diaElem
 {
   protected:
     void    setSize(int z) {size=z;};
@@ -319,14 +319,13 @@
   int getRequiredLayout(void);
 };
 /*************************************************/
-typedef struct diaMenuEntry
+class diaMenuEntry
 {
-  public:
+public:
     uint32_t    val;
     const char *text;
     const char *desc;
-  public:
-}diaMenuEntry;
+};
 
 class ADM_COREUI6_EXPORT diaMenuEntryDynamic : public diaMenuEntry
 {
@@ -631,7 +630,7 @@
   int getRequiredLayout(void);
 };
 /**********************************************/
-typedef diaElem *(CREATE_ASPECTRATIO_T)(uint32_t *value, const char *title, const char *tip );
+typedef diaElem *(CREATE_ASPECTRATIO_T)(uint32_t *num, uint32_t *den, const char *title, const char *tip );
 class ADM_COREUI6_EXPORT diaElemAspectRatio : public diaElem
 {
 public:
@@ -644,6 +643,7 @@
 	void getMe(void);
 	void enable(uint32_t onoff);
 	int getRequiredLayout(void);
+        void finalize(void);
 };
 
 /*********************************************/

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUI/src/DIA_factory.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUI/src/DIA_factory.cpp Changed

@@ -475,6 +475,31 @@
 		internalPointer->enable(onoff); 
 	}
 DIA_MKSTUBS(diaElemToggleUint)
+// ****************** diaElemAspectRatio ********************
+diaElemAspectRatio ::diaElemAspectRatio(uint32_t *num,uint32_t *den,const char *toggleTitle,const char *tip):
+	diaElem(ELEM_ASPECT_RATIO)
+{
+	ADM_assert(Factory); 
+	internalPointer=Factory->CreateAspectRatio(num,den,toggleTitle,tip);
+}
+diaElemAspectRatio ::~diaElemAspectRatio()
+	{
+	
+	ADM_assert(Factory); 
+	Factory->DestroyAspectRatio(internalPointer);
+	internalPointer=NULL;
+}
+void      diaElemAspectRatio::finalize(void)
+	{ 
+		ADM_assert(internalPointer); 
+		internalPointer->finalize(); 
+	}
+void      diaElemAspectRatio::enable(uint32_t onoff)
+	{ 
+		ADM_assert(internalPointer); 
+		internalPointer->enable(onoff); 
+	}
+DIA_MKSTUBS(diaElemAspectRatio)
 // ****************** diaElemToggleInt ********************
 diaElemToggleInt ::diaElemToggleInt(uint32_t *toggleValue,const char *toggleTitle, int32_t *uintval, 
 									const char *name,int32_t min,int32_t max,const char *tip):

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_paramList.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_paramList.cpp Changed

@@ -17,10 +17,8 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
-#include <string>
 #include "ADM_default.h"
 #include "ADM_paramList.h"
-#include <stddef.h>
 #include "ADM_encoderConf.h"
 #include "ADM_coreVideoEncoderFFmpeg_param.h"
 #include "FFcodecContext_param.h"
@@ -255,7 +253,7 @@
     int p=XgetParamSize(params);
     if(n>p)
     {
-        ADM_warning("Too many parameters in partial list");
+        ADM_warning("Too many parameters in partial list\n");
         return false;
     }
     int found=0;
@@ -386,17 +384,19 @@
 
 }
 /**
-    \fn ADM_paramLoad
+    \fn ADM_paramLoadPartial
     \brief Load a structure from a list of confCouple, accept partial fields
 */
 
 bool ADM_paramLoadPartial(CONFcouple *couples, const ADM_paramList *params,void *s)
 {
-   if(false==ADM_paramValidatePartialList(couples,params)) return false;
+   // don't reject too long or incomplete param lists, this does more harm than good
+   // e.g. on version update, but warnings are nice
+   ADM_paramValidatePartialList(couples,params);
    return ADM_paramLoadInternal(true,couples,params,s);
 }
 /**
-    \fn ADM_paramLoad
+    \fn ADM_paramSave
     \brief Save a structure to a list of confCouple
 */
 bool ADM_paramSave(CONFcouple **couples, const ADM_paramList *params,void *s)

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/JSONOptions.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/JSONOptions.h Changed

@@ -92,9 +92,10 @@
 
 /*
  *  JSON_BINARY is used to support binary, which is base64 encoded and decoded by libjson,
- *  if this option is not turned on, no base64 support is included
+ *  if this option is not turned off, no base64 support is included
  */
-//#define JSON_BINARY
+// MEANX #define JSON_BINARY
+
 
 
 /*
@@ -102,7 +103,7 @@
  *  and decoding.  This may be useful if you want to obfuscate your json, or send binary data over
  *  a network
  */
-//#define JSON_EXPOSE_BASE64
+// MEANX #define JSON_EXPOSE_BASE64
 
 
 /*
@@ -117,15 +118,15 @@
  *  your json into a stream, which will automatically hit a callback when full nodes are
  *  completed
  */
-//#define JSON_STREAM
+#define JSON_STREAM
 
 
 /*
  *  JSON_MEMORY_CALLBACKS exposes functions to register callbacks for allocating, resizing,
- *  and freeing memory.  Because libjson is designed for costomizability, it is feasible
+ *  and freeing memory.  Because libjson is designed for customizability, it is feasible
  *  that some users would like to further add speed by having the library utilize a memory
  *  pool.  With this option turned on, the default behavior is still done internally unless
- *  a callback is registered.  So you can have this option on and mot use it.
+ *  a callback is registered.  So you can have this option on and not use it.
  */
 //#define JSON_MEMORY_CALLBACKS
 
@@ -139,6 +140,16 @@
 
 
 /*
+ *	JSON_MEMORY_POOL Turns on libjson's iteraction with mempool++.  It is more efficient that simply
+ *	connecting mempool++ to the callbacks because it integrates things internally and uses a number
+ *	of memory pools.  This value tells libjson how large of a memory pool to start out with.  500KB 
+ *	should suffice for most cases.  libjson will distribute that within the pool for the best
+ *	performance depending on other settings.
+ */
+//#define JSON_MEMORY_POOL 524288
+
+
+/*
  *  JSON_MUTEX_CALLBACKS exposes functions to register callbacks to lock and unlock
  *  mutexs and functions to lock and unlock JSONNodes and all of it's children.  This 
  *  does not prevent other threads from accessing the node, but will prevent them from
@@ -213,7 +224,7 @@
  *  parsing json that has comments in it as it simply ignores them, but with this option
  *  it keeps the comments and allows you to insert further comments
  */
-//#define JSON_COMMENTS
+#define JSON_COMMENTS
 
 
 /*
@@ -241,16 +252,16 @@
 
 
 /*
- *  JSON_VALIDATE turns on validation features of libjson.  This option requires JSON_SAFE
+ *  JSON_VALIDATE turns on validation features of libjson.
  */
-//#define JSON_VALIDATE
+#define JSON_VALIDATE
 
 
 /*
  *  JSON_CASE_INSENSITIVE_FUNCTIONS turns on funtions for finding child nodes in a case-
  *  insenititve way
  */
-//#define JSON_CASE_INSENSITIVE_FUNCTIONS
+#define JSON_CASE_INSENSITIVE_FUNCTIONS
 
 
 /*
@@ -268,6 +279,7 @@
  */
 //#define JSON_BOOL_TYPE char
 
+
 /*
  *  JSON_INT_TYPE lets you change the int type for as_int.  If you ommit this option, the default
  *  long will be used
@@ -276,6 +288,13 @@
 
 
 /*
+ *  JSON_NUMBER_TYPE lets you change the number type for as_float as well as the internal storage for the
+ *	number.  If you omit this option, the default double will be used for most cases and float for JSON_LESS_MEMORY
+ */
+//#define JSON_NUMBER_TYPE double
+
+
+/*
  *  JSON_STRING_HEADER allows you to change the type of string that libjson uses both for the
  *  interface and internally.  It must implement most of the STL string interface, but not all
  *  of it.  Things like wxString or QString should wourk without much trouble
@@ -292,10 +311,10 @@
 
 
 /*
- *  JSON_NO_EXCEPTIONS turns off any exception trhowing by the library.  It may still use exceptions
+ *  JSON_NO_EXCEPTIONS turns off any exception throwing by the library.  It may still use exceptions
  *  internally, but the interface will never throw anything.
  */
-#define JSON_NO_EXCEPTIONS
+//#define JSON_NO_EXCEPTIONS
 
 
 /*
@@ -303,7 +322,40 @@
  *  compatibility between major releases.  It is highly recommended that you move your functions
  *  over to the new equivalents
  */
-#define JSON_DEPRECATED_FUNCTIONS
+//#define JSON_DEPRECATED_FUNCTIONS
+
+
+/*
+ *  JSON_CASTABLE allows you to call as_bool on a number and have it do the 0 or not 0 check,
+ *  it also allows you to ask for a string from a number, or boolean, and have it return the right thing.
+ *  Without this option, those types of requests are undefined.  It also exposes the as_array, as_node, and cast 
+ *  functions
+ */
+#define JSON_CASTABLE
+
+
+/*
+ *  JSON_SECURITY_MAX_NEST_LEVEL is a security measure added to make prevent against DoS attacks
+ *  This only affects validation, as if you are worried about security attacks, then you are
+ *  most certainly validating json before sending it to be parsed.  This option allows you to limitl how many
+ *  levels deep a JSON Node can go.  128 is a good depth to start with
+ */
+#define JSON_SECURITY_MAX_NEST_LEVEL 128
+
+
+/*
+ *  JSON_SECURITY_MAX_STRING_LENGTH is another security measure, preventing DoS attacks with very long
+ *  strings of JSON.  32MB is the default value for this, this allows large images to be embedded
+ */
+#define JSON_SECURITY_MAX_STRING_LENGTH 33554432
+
+
+/*
+ *	JSON_SECURITY_MAX_STREAM_OBJECTS is a security measure for streams.  It prevents DoS attacks with
+ *	large number of objects hitting the stream all at once.  128 is a lot of objects, but not out of
+ *	the question for high speed systems.
+ */
+#define JSON_SECURITY_MAX_STREAM_OBJECTS 128
 
 #endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/CMakeLists.txt Changed

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONAllocator.cpp Added

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONAllocator.h Added

@@ -0,0 +1,82 @@
+#ifndef JSON_ALLOCATOR_H
+#define JSON_ALLOCATOR_H
+
+#include "JSONStats.h"
+#if defined(JSON_MEMORY_CALLBACKS) || defined(JSON_MEMORY_POOL)
+
+#include <cstddef>
+
+//need these for the json_nothrow
+#include "JSONDefs/Visual_C.h"
+#include "JSONDefs/GNU_C.h"
+#include "JSONDefs/Unknown_C.h"
+
+class JSONAllocatorRelayer {
+public:
+	static void * alloc(size_t bytes) json_nothrow json_hot;
+	static void dealloc(void * ptr) json_nothrow json_hot;
+};
+
+template <class T> class json_allocator;
+
+// specialize for void:
+template <> class json_allocator<void> {
+public:
+	typedef void*       pointer;
+	typedef const void* const_pointer;
+	// reference to void members are impossible.
+	typedef void value_type;
+	template <class U> struct rebind { typedef json_allocator<U> other; };
+};
+
+template <class T> class json_allocator {
+public:
+	typedef size_t    size_type;
+	typedef ptrdiff_t difference_type;
+	typedef T*        pointer;
+	typedef const T*  const_pointer;
+	typedef T&        reference;
+	typedef const T&  const_reference;
+	typedef T         value_type;
+	template <class U> struct rebind { typedef json_allocator<U> other; };
+	
+	//LIBJSON_OBJECT(json_allocator);
+	
+	inline json_allocator() json_nothrow { 
+		//LIBJSON_CTOR; 
+	}
+	inline json_allocator(const json_allocator&) json_nothrow { 
+		//LIBJSON_COPY_CTOR; 
+	}
+	template <class U> inline json_allocator(const json_allocator<U>&) json_nothrow { 
+		//LIBJSON_COPY_CTOR; 
+	}
+	inline ~json_allocator() json_nothrow { 
+		//LIBJSON_DTOR; 
+	}
+	
+	inline pointer address(reference x) const { return &x; }
+	inline const_pointer address(const_reference x) const { return &x; }
+	
+	inline pointer allocate(size_type n, json_allocator<void>::const_pointer = 0) json_hot {
+		return (pointer)JSONAllocatorRelayer::alloc(n * sizeof(T));
+	}
+	inline void deallocate(pointer p, size_type) json_hot {
+		JSONAllocatorRelayer::dealloc(p);
+	}
+	
+	inline size_type max_size() const json_nothrow { return 0xEFFFFFFF; }
+	
+	inline void construct(pointer p, const T& val){
+		new(p)T(val);
+	};
+	inline void destroy(pointer p){
+		((T*)p) -> ~T();
+	}
+};
+
+template <class T1, class T2> inline bool operator==(const json_allocator<T1>&, const json_allocator<T2>&) json_nothrow { return true; }
+template <class T1, class T2> inline bool operator!=(const json_allocator<T1>&, const json_allocator<T2>&) json_nothrow { return false; }
+
+#endif
+#endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONChildren.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONChildren.cpp Changed

@@ -1,11 +1,10 @@
 #include "JSONChildren.h"
 #include "JSONNode.h"
 
-#ifdef JSON_UNIT_TEST
-    void jsonChildren::addAllocCount(void){ JSONNode::incChildrenAllocCount();}
-    void jsonChildren::subAllocCount(void){ JSONNode::decChildrenAllocCount();}
-#endif
-
+/*
+ *	reserves a certain number of bytes, in memory saving mode it creates a special
+ *	type of child container that will not autoshrink
+ */
 void jsonChildren::reserve2(jsonChildren *& mine, json_index_t amount) json_nothrow {
     if (mine -> array != 0){
 	   if (mine -> mycapacity < amount){
@@ -85,11 +84,11 @@
     JSON_ASSERT(position + number <= array + mysize, JSON_TEXT("erasing out of bounds 2"));
     if (position + number >= array + mysize){
 	   mysize = (json_index_t)(position - array);
-	   #ifndef JSON_ISO_STRICT__
+	   #ifndef JSON_ISO_STRICT
 		  JSON_ASSERT((long long)position - (long long)array >= 0, JSON_TEXT("doing negative allocation"));
 	   #endif
     } else {
-	   memmove(position, position + number, (mysize - (position - array) - number) * sizeof(JSONNode *));
+	   std::memmove(position, position + number, (mysize - (position - array) - number) * sizeof(JSONNode *));
 	   mysize -= number;
     }
 }

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONChildren.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONChildren.h Changed

@@ -34,21 +34,17 @@
     #define childrenVirtual
 #endif
 
-#ifndef JSON_UNIT_TEST
-    #define addAllocCount() (void)0
-    #define subAllocCount() (void)0
-#endif
-
 class jsonChildren {
 public:
+	LIBJSON_OBJECT(jsonChildren);
     //starts completely empty and the array is not allocated
     jsonChildren(void) json_nothrow : array(0), mysize(0), mycapacity(0) {
-	   addAllocCount();
+	   LIBJSON_CTOR;
     }
 
     #ifdef JSON_LESS_MEMORY
 	   jsonChildren(JSONNode** ar, json_index_t si, json_index_t ca) json_nothrow : array(ar), mysize(si), mycapacity(ca) {
-		  addAllocCount();
+		  LIBJSON_CTOR;
 	   }
     #endif
 
@@ -58,14 +54,9 @@
 		  deleteAll();
 		  libjson_free<JSONNode*>(array);
 	   }
-	   subAllocCount();
+	   LIBJSON_DTOR;
     }
 
-    #ifdef JSON_UNIT_TEST
-	   void addAllocCount(void);
-	   void subAllocCount(void);
-    #endif
-
     //increase the size of the array
     void inc(json_index_t amount) json_nothrow;
     void inc(void) json_nothrow;
@@ -81,7 +72,7 @@
     void push_front(JSONNode * item) json_nothrow {
 	   JSON_ASSERT(this != 0, JSON_TEXT("Children is null push_front"));
 	   inc();
-	   memmove(array + 1, array, mysize++ * sizeof(JSONNode *));
+	   std::memmove(array + 1, array, mysize++ * sizeof(JSONNode *));
 	   array[0] = item;
     }
 
@@ -136,29 +127,24 @@
     }
 
     //makes sure that even after shirnking and expanding, the iterator is in same relative position
+	template <bool reverse>
     struct iteratorKeeper {
     public:
-	   #ifdef JSON_LIBRARY
-		  iteratorKeeper(jsonChildren * pthis, JSONNode ** & position) json_nothrow :
-			 myRelativeOffset((json_index_t)(position - pthis -> array)),
-	   #else
-		  iteratorKeeper(jsonChildren * pthis, JSONNode ** & position, bool reverse = false) json_nothrow :
-			 myRelativeOffset(reverse ? (json_index_t)(pthis -> array + (size_t)pthis -> mysize - position) : (json_index_t)(position - pthis -> array)),
-			 myReverse(reverse),
-	   #endif
-			 myChildren(pthis),
-			 myPos(position){}
+		LIBJSON_OBJECT(jsonChildren::iteratorKeeper);
+	  iteratorKeeper(jsonChildren * pthis, JSONNode ** & position) json_nothrow :
+		 myRelativeOffset(reverse ? (json_index_t)(pthis -> array + (size_t)pthis -> mysize - position) : (json_index_t)(position - pthis -> array)),
+		 myChildren(pthis),
+		 myPos(position){
+			LIBJSON_CTOR;
+		}
 
 	   ~iteratorKeeper(void) json_nothrow {
-		  #ifdef JSON_LIBRARY
-			 myPos = myChildren -> array + myRelativeOffset;
-		  #else
-			 if (json_unlikely(myReverse)){
-				myPos = myChildren -> array + myChildren -> mysize - myRelativeOffset;
-			 } else {
-				myPos = myChildren -> array + myRelativeOffset;
-			 }
-		  #endif
+		 LIBJSON_DTOR;
+		 if (reverse){
+			myPos = myChildren -> array + myChildren -> mysize - myRelativeOffset;
+		 } else {
+			myPos = myChildren -> array + myRelativeOffset;
+		 }
 	   }
     private:
 	   iteratorKeeper(const iteratorKeeper &);
@@ -167,9 +153,6 @@
 	   json_index_t myRelativeOffset;
 	   jsonChildren * myChildren;
 	   JSONNode ** & myPos;
-	   #ifndef JSON_LIBRARY
-		  bool myReverse BITS(1);
-	   #endif
     };
 
     //This function DOES NOT delete the item it points to
@@ -178,8 +161,8 @@
 	   JSON_ASSERT(array != 0, JSON_TEXT("erasing something from a null array 1"));
 	   JSON_ASSERT(position >= array, JSON_TEXT("position is beneath the start of the array 1"));
 	   JSON_ASSERT(position <= array + mysize, JSON_TEXT("erasing out of bounds 1"));
-	   memmove(position, position + 1, (mysize-- - (position - array) - 1) * sizeof(JSONNode *));
-	   iteratorKeeper ik(this, position);
+	   std::memmove(position, position + 1, (mysize-- - (position - array) - 1) * sizeof(JSONNode *));
+	   iteratorKeeper<false> ik(this, position);
 	   shrink();
     }
 
@@ -187,7 +170,7 @@
     inline void erase(JSONNode ** & position, json_index_t number) json_nothrow {
 	   JSON_ASSERT(this != 0, JSON_TEXT("Children is null erase 2"));
 	   doerase(position, number);
-	   iteratorKeeper ik(this, position);
+	   iteratorKeeper<false> ik(this, position);
 	   shrink();
     }
 
@@ -196,7 +179,7 @@
     inline void erase(JSONNode ** position, json_index_t number, JSONNode ** & starter) json_nothrow {
 	   JSON_ASSERT(this != 0, JSON_TEXT("Children is null erase 3"));
 	   doerase(position, number);
-	   iteratorKeeper ik(this, starter);
+	   iteratorKeeper<false> ik(this, starter);
 	   shrink();
     }
 
@@ -209,15 +192,18 @@
 	   //position isnt relative to array because of realloc
 	   JSON_ASSERT(position >= array, JSON_TEXT("position is beneath the start of the array insert 1"));
 	   JSON_ASSERT(position <= array + mysize, JSON_TEXT("position is above the end of the array insert 1"));
-	   {
-		  #ifdef JSON_LIBRARY
-			 iteratorKeeper ik(this, position);
-		  #else
-			 iteratorKeeper ik(this, position, reverse);
-		  #endif
-		  inc();
-	   }
-	   memmove(position + 1, position, (mysize++ - (position - array)) * sizeof(JSONNode *));
+		#ifndef JSON_LIBRARY
+		if (reverse){
+			iteratorKeeper<true> ik(this, position);
+			inc();
+		} else 
+		#endif
+		{
+			iteratorKeeper<false> ik(this, position);
+			inc();
+		}
+
+	   std::memmove(position + 1, position, (mysize++ - (position - array)) * sizeof(JSONNode *));
 	   *position = item;
     }
 
@@ -226,12 +212,12 @@
 	   JSON_ASSERT(position >= array, JSON_TEXT("position is beneath the start of the array insert 2"));
 	   JSON_ASSERT(position <= array + mysize, JSON_TEXT("position is above the end of the array insert 2"));
 	   {
-		  iteratorKeeper ik(this, position);
+		  iteratorKeeper<false> ik(this, position);
 		  inc(num);
 	   }
 	   const size_t ptrs = ((JSONNode **)(array + mysize)) - position;
-	   memmove(position + num, position, ptrs * sizeof(JSONNode *));
-	   memcpy(position, items, num * sizeof(JSONNode *));
+	   std::memmove(position + num, position, ptrs * sizeof(JSONNode *));
+	   std::memcpy(position, items, num * sizeof(JSONNode *));
 	   mysize += num;
     }
 
@@ -243,6 +229,7 @@
 	   array = json_malloc<JSONNode*>(mycapacity = amount);
     }
 
+	//it is static because mine might change pointers entirely
     static void reserve2(jsonChildren *& mine, json_index_t amount) json_nothrow;
 
     //shrinks the array to only as large as it needs to be to hold everything within it
@@ -294,16 +281,17 @@
 #ifdef JSON_LESS_MEMORY
     class jsonChildren_Reserved : public jsonChildren {
     public:
+		LIBJSON_OBJECT(jsonChildren_Reserved);
 	   jsonChildren_Reserved(jsonChildren * orig, json_index_t siz) json_nothrow : jsonChildren(orig -> array, orig -> mysize, orig -> mycapacity), myreserved(siz) {
 		  orig -> array = 0;
 		  deleteChildren(orig);
-		  addAllocCount();
+		  LIBJSON_CTOR;
 	   }
 	   jsonChildren_Reserved(const jsonChildren_Reserved & orig) json_nothrow  : jsonChildren(orig.array, orig.mysize, orig.mycapacity), myreserved(orig.myreserved){
-		  addAllocCount();
+		  LIBJSON_COPY_CTOR;
 	   }
 	   inline virtual ~jsonChildren_Reserved() json_nothrow {
-		  subAllocCount();
+		  LIBJSON_DTOR;
 	   };
 	   inline virtual void shrink() json_nothrow {
 		  JSON_ASSERT(this != 0, JSON_TEXT("Children is null shrink reserved"));

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDebug.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDebug.cpp Changed

@@ -4,10 +4,12 @@
 #ifdef JSON_STDERROR
     #include <iostream>  //need std::cerr
 #else
+    #include "JSONSingleton.h"
     //otherwise, use a callback to tell the end user what happened
-    json_error_callback_t ErrorCallback = 0;
-    void JSONDebug::register_callback(json_error_callback_t callback) json_nothrow {
-	   ErrorCallback = callback;
+    json_error_callback_t JSONDebug::register_callback(json_error_callback_t callback) json_nothrow {
+		json_error_callback_t res = JSONSingleton<json_error_callback_t>::get();
+        JSONSingleton<json_error_callback_t>::set(callback);
+		return res;
     }
 #endif
 
@@ -20,7 +22,7 @@
 		  std::cerr << std::string(msg.begin(), msg.end()) << std::endl;
 	   #endif
     #else
-	   if (json_likely(ErrorCallback != 0)){  //only do anything if the callback is registered
+	   if (json_error_callback_t ErrorCallback = JSONSingleton<json_error_callback_t>::get()){  //only do anything if the callback is registered
 		  #ifdef JSON_LIBRARY
 			 ErrorCallback(msg.c_str());
 		  #else
@@ -37,3 +39,4 @@
     }
 }
 #endif
+

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDebug.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDebug.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDefs.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDefs.h Changed

@@ -14,7 +14,7 @@
 #include "JSONDefs/Strings_Defs.h"
 
 #define __LIBJSON_MAJOR__ 7
-#define __LIBJSON_MINOR__ 1
+#define __LIBJSON_MINOR__ 6
 #define __LIBJSON_PATCH__ 1
 #define __LIBJSON_VERSION__ (__LIBJSON_MAJOR__ * 10000 + __LIBJSON_MINOR__ * 100 + __LIBJSON_PATCH__)
 
@@ -26,10 +26,19 @@
 #define JSON_NODE '\5'
 
 #ifdef __cplusplus
-    #ifdef JSON_STRING_HEADER
-	   #include JSON_STRING_HEADER
-    #endif
+	#if defined(JSON_MEMORY_CALLBACKS) || defined(JSON_MEMORY_POOL)
+		#include "JSONAllocator.h"
+	#else
+		#define json_allocator std::allocator
+	#endif
+
+	#ifdef JSON_STRING_HEADER
+		#include JSON_STRING_HEADER
+	#else
+		typedef std::basic_string<json_char, std::char_traits<json_char>, json_allocator<json_char> > json_string;
+	#endif
 #endif
+#define JSON_MAP(x, y) std::map<x, y, std::less<x>, json_allocator<std::pair<const x, y> > >
 
 #ifdef JSON_NO_EXCEPTIONS
     #define json_throw(x)
@@ -56,7 +65,7 @@
     #endif
 #else
     #ifdef __GNUC__
-	   #ifdef JSON_ISO_STRICT
+	   #ifdef __STRICT_ANSI__
 		  #warning, Using -ansi GCC option, but JSON_ISO_STRICT not on, turning it on for you
 		  #define JSON_ISO_STRICT
 	   #endif
@@ -64,23 +73,29 @@
 #endif
 
 
+#ifdef JSON_NUMBER_TYPE
+	typedef JSON_NUMBER_TYPE json_number;
+	#define JSON_FLOAT_THRESHHOLD 0.00001
+#else
+	#ifdef JSON_LESS_MEMORY
+		typedef float json_number;
+		#define JSON_FLOAT_THRESHHOLD 0.00001f
+	#else
+		typedef double json_number;
+		#define JSON_FLOAT_THRESHHOLD 0.00001
+	#endif
+#endif
+
+
 #ifdef JSON_LESS_MEMORY
     /* PACKED and BITS stored in compiler specific headers */
     #define START_MEM_SCOPE {
     #define END_MEM_SCOPE }
-    typedef float json_number;
-    #define JSON_FLOAT_THRESHHOLD 0.00001f
 #else
     #define PACKED(x)
     #define BITS(x)
     #define START_MEM_SCOPE
     #define END_MEM_SCOPE
-    //#ifdef JSON_ISO_STRICT
-	   typedef double json_number;
-    //#else
-	   //typedef long double json_number;
-    //#endif
-    #define JSON_FLOAT_THRESHHOLD 0.00001
 #endif
 
 #if defined JSON_DEBUG || defined JSON_SAFE
@@ -104,14 +119,14 @@
 #endif
 
 #ifdef JSON_INT_TYPE
-    #if (JSON_INT_TYPE == long long) && defined(JSON_ISO_STRICT)
-	   #error, JSON_INT_TYPE cant be a long long unless JSON_ISO_STRICT is off
-    #endif
     typedef JSON_INT_TYPE json_int_t;
 #else
     typedef long json_int_t;
 #endif
 
+#define JSONSTREAM_SELF (void*)-1
+typedef void (*json_stream_e_callback_t)(void * identifier);
+
 typedef void (*json_mutex_callback_t)(void *);
 typedef void (*json_free_t)(void *);
 #ifndef JSON_LIBRARY
@@ -122,7 +137,7 @@
     typedef JSONNODE** JSONNODE_ITERATOR;
     #ifdef JSON_STREAM
 	   #define JSONSTREAM void
-	   typedef void (*json_stream_callback_t)(JSONNODE *);
+	    typedef void (*json_stream_callback_t)(JSONNODE *, void * identifier);
     #endif
     typedef void * (*json_malloc_t)(unsigned long);
     typedef void * (*json_realloc_t)(void *, unsigned long);
@@ -147,8 +162,8 @@
 #endif
 
 #ifdef JSON_UNIT_TEST
-    #define JSON_PRIVATE
-    #define JSON_PROTECTED
+    #define JSON_PRIVATE public:
+    #define JSON_PROTECTED public:
 #else
     #define JSON_PRIVATE private:
     #define JSON_PROTECTED protected:
@@ -164,4 +179,6 @@
     #endif
 #endif
 
+#define JSON_TEMP_COMMENT_IDENTIFIER JSON_TEXT('#')
+
 #endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDefs/GNU_C.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDefs/GNU_C.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Strings_Defs.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Strings_Defs.h Changed

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONGlobals.h Added

@@ -0,0 +1,95 @@
+#ifndef JSON_GLOBALS_H
+#define JSON_GLOBALS_H
+
+#include "JSONDefs.h"
+
+/*
+ *	The use of singletons for globals makes globals not
+ *	actually be initialized until it is first needed, this
+ *	makes the library faster to load, and have a smaller
+ *	memory footprint
+ */
+
+#define json_global_decl(TYPE, NAME, VALUE)						\
+class jsonSingleton ## NAME {									\
+public:															\
+	inline static TYPE & getValue() json_nothrow {				\
+		static jsonSingleton ## NAME single;					\
+		return single.val;										\
+	}															\
+protected:														\
+	inline jsonSingleton ## NAME() json_nothrow : val(VALUE) {}	\
+	TYPE val;													\
+}
+
+#define json_global_decl_strconfig(TYPE, NAME, VALUE)			\
+class jsonSingleton ## NAME {									\
+public:															\
+	inline static TYPE & getValue() json_nothrow {				\
+		static jsonSingleton ## NAME single;					\
+		return single.val;										\
+	}															\
+protected:														\
+	inline jsonSingleton ## NAME() json_nothrow {				\
+		const std::string tmp = std::string(VALUE);				\
+		val = json_string(tmp.begin(), tmp.end());				\
+	}															\
+	TYPE val;													\
+}
+
+#define json_global(NAME) jsonSingleton ## NAME::getValue()
+
+#include <string>
+json_global_decl(json_string, EMPTY_JSON_STRING, );
+json_global_decl(std::string, EMPTY_STD_STRING, );
+
+json_global_decl(json_string, CONST_TRUE, JSON_TEXT("true"));
+json_global_decl(json_string, CONST_FALSE, JSON_TEXT("false"));
+json_global_decl(json_string, CONST_NULL, JSON_TEXT("null"));
+
+#ifndef JSON_NEWLINE
+	json_global_decl(json_string, NEW_LINE, JSON_TEXT("\n"));
+#else
+	json_global_decl_strconfig(json_string, NEW_LINE, JSON_NEWLINE);
+#endif
+
+#ifdef JSON_WRITE_BASH_COMMENTS
+	json_global_decl(json_string, SINGLELINE_COMMENT, JSON_TEXT("#"));
+#else
+	json_global_decl(json_string, SINGLELINE_COMMENT, JSON_TEXT("//"));
+#endif
+
+#ifdef JSON_INDENT
+	json_global_decl_strconfig(json_string, INDENT, JSON_INDENT);
+#endif
+
+#ifdef JSON_MUTEX_CALLBACKS
+	#include <map>
+	json_global_decl(JSON_MAP(void *, unsigned int), MUTEX_MANAGER, );
+	json_global_decl(JSON_MAP(int, JSON_MAP(void *, unsigned int) ), THREAD_LOCKS, );
+#endif
+
+#ifdef JSON_LIBRARY
+	#ifdef JSON_MEMORY_MANAGE
+		#include "JSONMemory.h"
+		json_global_decl(auto_expand, STRING_HANDLER, );
+		json_global_decl(auto_expand_node, NODE_HANDLER, );
+		#ifdef JSON_STREAM
+			json_global_decl(auto_expand_stream, STREAM_HANDLER, );
+		#endif
+	#endif
+#endif
+
+//These are common error responses
+json_global_decl(json_string, ERROR_TOO_LONG, JSON_TEXT("Exceeding JSON_SECURITY_MAX_STRING_LENGTH"));
+json_global_decl(json_string, ERROR_UNKNOWN_LITERAL, JSON_TEXT("Unknown JSON literal: "));
+json_global_decl(json_string, ERROR_NON_CONTAINER, JSON_TEXT("Calling container method on non-container: "));
+json_global_decl(json_string, ERROR_NON_ITERATABLE, JSON_TEXT("Calling iterator method on non-iteratable: "));
+json_global_decl(json_string, ERROR_NULL_IN_CHILDREN, JSON_TEXT("a null pointer within the children"));
+json_global_decl(json_string, ERROR_UNDEFINED, JSON_TEXT("Undefined results: "));
+json_global_decl(json_string, ERROR_LOWER_RANGE, JSON_TEXT(" is outside the lower range of "));
+json_global_decl(json_string, ERROR_UPPER_RANGE, JSON_TEXT(" is outside the upper range of "));
+json_global_decl(json_string, ERROR_NOT_BASE64, JSON_TEXT("Not base64"));
+json_global_decl(json_string, ERROR_OUT_OF_MEMORY, JSON_TEXT("Out of memory"));
+
+#endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONIterators.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONIterators.cpp Changed

@@ -15,7 +15,7 @@
 
 JSONNode::json_iterator JSONNode::find(const json_string & name_t) json_nothrow {
     JSON_CHECK_INTERNAL();
-    JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("finding a non-iteratable node"));
+    JSON_ASSERT(type() == JSON_NODE, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("find"));
     makeUniqueInternal();
     if (JSONNode ** res = internal -> at(name_t)){
 	   return ptr_to_json_iterator(res);
@@ -26,7 +26,7 @@
 #ifdef JSON_CASE_INSENSITIVE_FUNCTIONS
     JSONNode::json_iterator JSONNode::find_nocase(const json_string & name_t) json_nothrow {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("finding a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("find_nocase"));
 	   makeUniqueInternal();
 	   if (JSONNode ** res = internal -> at_nocase(name_t)){
 		  return ptr_to_json_iterator(res);
@@ -37,7 +37,7 @@
 
 JSONNode::json_iterator JSONNode::erase(json_iterator pos) json_nothrow {
     JSON_CHECK_INTERNAL();
-    JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node"));
+    JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("erase"));
     JSON_ASSERT_UNIQUE("erase 1");
     JSON_ASSERT_SAFE(pos < end(), JSON_TEXT("erase out of range"), return end(););
     JSON_ASSERT_SAFE(pos >= begin(), JSON_TEXT("erase out of range"), return begin(););
@@ -49,7 +49,7 @@
 JSONNode::json_iterator JSONNode::erase(json_iterator _start, const json_iterator & _end) json_nothrow {
     if (_start == _end) return _start;
     JSON_CHECK_INTERNAL();
-    JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node"));
+    JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("erase"));
     JSON_ASSERT_UNIQUE("erase 3");
     JSON_ASSERT_SAFE(_start <= end(), JSON_TEXT("erase out of lo range"), return end(););
     JSON_ASSERT_SAFE(_end <= end(), JSON_TEXT("erase out of hi range"), return end(););
@@ -69,7 +69,7 @@
 JSONNode::json_iterator JSONNode::insert(json_iterator pos, const JSONNode & x) json_nothrow {
 #endif
     JSON_CHECK_INTERNAL();
-    JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node"));
+    JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("insert"));
     JSON_ASSERT_UNIQUE("insert 1");
     if (json_iterator_ptr(pos) >= internal -> CHILDREN -> end()){
 	   internal -> push_back(x);
@@ -86,7 +86,7 @@
 
 JSONNode::json_iterator JSONNode::insertFFF(json_iterator pos, JSONNode ** const _start, JSONNode ** const _end) json_nothrow {
     JSON_CHECK_INTERNAL();
-    JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node"));
+    JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("insertFFF"));
     JSON_ASSERT_UNIQUE("insertFFF");
     JSON_ASSERT_SAFE(pos <= end(), JSON_TEXT("insert out of high range"), return end(););
     JSON_ASSERT_SAFE(pos >= begin(), JSON_TEXT("insert out of low range"), return begin(););
@@ -103,7 +103,7 @@
 #ifndef JSON_LIBRARY
     JSONNode::const_iterator JSONNode::find(const json_string & name_t) const json_nothrow {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("finding a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("find"));
 	   if (JSONNode ** res = internal -> at(name_t)){
 		  return JSONNode::const_iterator(res);
 	   }
@@ -113,7 +113,7 @@
     #ifdef JSON_CASE_INSENSITIVE_FUNCTIONS
 	   JSONNode::const_iterator JSONNode::find_nocase(const json_string & name_t) const json_nothrow {
 		  JSON_CHECK_INTERNAL();
-		  JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("finding a non-iteratable node"));
+		  JSON_ASSERT(type() == JSON_NODE, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("find_nocase"));
 		  if (JSONNode ** res = internal -> at_nocase(name_t)){
 			 return JSONNode::const_iterator(res);
 		  }
@@ -123,7 +123,7 @@
 
     JSONNode::reverse_iterator JSONNode::erase(reverse_iterator pos) json_nothrow {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("erase"));
 	   JSON_ASSERT_UNIQUE("erase 2");
 	   JSON_ASSERT_SAFE(pos < rend(), JSON_TEXT("erase out of range"), return rend(););
 	   JSON_ASSERT_SAFE(pos >= rbegin(), JSON_TEXT("erase out of range"), return rbegin(););
@@ -135,7 +135,7 @@
     JSONNode::reverse_iterator JSONNode::erase(reverse_iterator _start, const reverse_iterator & _end) json_nothrow {
 	   if (_start == _end) return _start;
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("erase"));
 	   JSON_ASSERT_UNIQUE("erase 4");
 	   JSON_ASSERT_SAFE(_start <= rend(), JSON_TEXT("erase out of lo range"), return rend(););
 	   JSON_ASSERT_SAFE(_end <= rend(), JSON_TEXT("erase out of hi range"), return rend(););
@@ -151,7 +151,7 @@
 
     JSONNode::reverse_iterator JSONNode::insert(reverse_iterator pos, const JSONNode & x) json_nothrow {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("insert"));
 	   JSON_ASSERT_UNIQUE("insert 1");
 	   if (pos.it < internal -> CHILDREN -> begin()){
 		  internal -> push_front(x);
@@ -164,7 +164,7 @@
 
     JSONNode::reverse_iterator JSONNode::insertRFF(reverse_iterator pos, JSONNode ** const _start, JSONNode ** const _end) json_nothrow {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("insertRFF"));
 	   JSON_ASSERT_UNIQUE("insert RFF");
 	   JSON_ASSERT_SAFE(pos <= rend(), JSON_TEXT("insert out of range"), return rend(););
 	   JSON_ASSERT_SAFE(pos >= rbegin(), JSON_TEXT("insert out of range"), return rbegin(););
@@ -180,7 +180,7 @@
 
     JSONNode::iterator JSONNode::insertFRR(json_iterator pos, JSONNode ** const _start, JSONNode ** const _end) json_nothrow {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("insertFRR"));
 	   JSON_ASSERT_UNIQUE("insert FRR");
 	   JSON_ASSERT_SAFE(pos <= end(), JSON_TEXT("insert out of range"), return end(););
 	   JSON_ASSERT_SAFE(pos >= begin(), JSON_TEXT("insert out of range"), return begin(););
@@ -196,7 +196,7 @@
 
     JSONNode::reverse_iterator JSONNode::insertRRR(reverse_iterator pos, JSONNode ** const _start, JSONNode ** const _end) json_nothrow {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("insertRRR"));
 	   JSON_ASSERT_UNIQUE("insert RRR");
 	   JSON_ASSERT_SAFE(pos <= rend(), JSON_TEXT("insert out of range"), return rend(););
 	   JSON_ASSERT_SAFE(pos >= rbegin(), JSON_TEXT("insert out of range"), return rbegin(););

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONMemory.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONMemory.cpp Changed

@@ -3,7 +3,7 @@
 #ifdef JSON_MEMORY_MANAGE
     #include "JSONNode.h"
     void auto_expand::purge(void) json_nothrow {
-	   for(std::map<void *, void *>::iterator i = mymap.begin(), en = mymap.end(); i != en; ++i){
+	   for(JSON_MAP(void *, void *)::iterator i = mymap.begin(), en = mymap.end(); i != en; ++i){
 		  #if defined(JSON_DEBUG) || defined(JSON_SAFE)
 			 void * temp = (void*)i -> first;  //because its pass by reference
 			 libjson_free<void>(temp);
@@ -14,7 +14,7 @@
     }
 
     void auto_expand_node::purge(void) json_nothrow {
-	   for(std::map<void *, JSONNode *>::iterator i = mymap.begin(), en = mymap.end(); i != en; ++i){
+	   for(JSON_MAP(void *, JSONNode *)::iterator i = mymap.begin(), en = mymap.end(); i != en; ++i){
 		  JSONNode::deleteJSONNode((JSONNode *)i -> second);
 	   }
     }
@@ -22,69 +22,128 @@
     #ifdef JSON_STREAM
 	   #include "JSONStream.h"
 	   void auto_expand_stream::purge(void) json_nothrow {
-		  for(std::map<void *, JSONStream *>::iterator i = mymap.begin(), en = mymap.end(); i != en; ++i){
+		  for(JSON_MAP(void *, JSONStream *)::iterator i = mymap.begin(), en = mymap.end(); i != en; ++i){
 			 JSONStream::deleteJSONStream((JSONStream *)i -> second);
 		  }
 	   }
     #endif
 #endif
 
-#ifdef JSON_MEMORY_CALLBACKS
+#if defined(JSON_MEMORY_CALLBACKS) || defined(JSON_MEMORY_POOL)
 
-json_malloc_t mymalloc = 0;
-json_realloc_t myrealloc = 0;
-json_free_t myfree = 0;
+#ifdef JSON_MEMORY_POOL
+	#include "JSONMemoryPool.h"
+    static bucket_pool_8<MEMPOOL_1, MEMPOOL_2, MEMPOOL_3, MEMPOOL_4, MEMPOOL_5, MEMPOOL_6, MEMPOOL_7, MEMPOOL_8> json_generic_mempool;
+    
+	//This class is only meant to initiate the mempool to start out using std::malloc/realloc/free
+	class mempool_callback_setter {
+    public:
+		LIBJSON_OBJECT(mempool_callback_setter);
+        inline mempool_callback_setter(void) json_nothrow {
+		`	LIBJSON_CTOR;
+            mempool_callbacks::set(std::malloc, std::realloc, std::free);
+        }
+    private:
+        inline mempool_callback_setter(const mempool_callback_setter & o);
+        inline mempool_callback_setter & operator = (const mempool_callback_setter & o);
+    };
+    static mempool_callback_setter __mempoolcallbacksetter;
+#endif
+
+#include "JSONSingleton.h"
 
 void * JSONMemory::json_malloc(size_t siz) json_nothrow {
-    if (mymalloc != 0){
-	   #ifdef JSON_DEBUG  //in debug mode, see if the malloc was successful
-		  void * result = mymalloc(siz);
-		  JSON_ASSERT(result, JSON_TEXT("out of memory"));
-		  return result;
-	   #else
-		  return mymalloc(siz);
-	   #endif
-    }
-    #ifdef JSON_DEBUG  //in debug mode, see if the malloc was successful
-	   void * result = malloc(siz);
-	   JSON_ASSERT(result, JSON_TEXT("out of memory"));
-	   return result;
-    #else
-	   return malloc(siz);
+    #ifdef JSON_MEMORY_POOL
+		return json_generic_mempool.allocate(siz);
+	#else
+        if (json_malloc_t callback = JSONSingleton<json_malloc_t>::get()){
+	       #if(defined(JSON_DEBUG) && (!defined(JSON_MEMORY_CALLBACKS))) //in debug mode without mem callback, see if the malloc was successful
+		      void * result = callback(siz);
+		      JSON_ASSERT(result, JSON_TEXT("Out of memory"));
+		      return result;
+	       #else
+		      return callback(siz);
+	       #endif
+        }
+        #if(defined(JSON_DEBUG) && (!defined(JSON_MEMORY_CALLBACKS))) //in debug mode without mem callback, see if the malloc was successful
+	       void * result = std::malloc(siz);
+	       JSON_ASSERT(result, JSON_TEXT("Out of memory"));
+	       return result;
+        #else
+	       return std::malloc(siz);
+        #endif
+    #endif
+}
+
+void JSONMemory::json_free(void * ptr) json_nothrow {
+    #ifdef JSON_MEMORY_POOL
+		json_generic_mempool.deallocate(ptr);
+	#else
+        if (json_free_t callback = JSONSingleton<json_free_t>::get()){
+	       callback(ptr);
+        } else {
+	       std::free(ptr);
+        }
     #endif
 }
 
 void * JSONMemory::json_realloc(void * ptr, size_t siz) json_nothrow {
-    if (myrealloc != 0){
-	   #ifdef JSON_DEBUG  //in debug mode, see if the malloc was successful
-		  void * result = myrealloc(ptr, siz);
-		  JSON_ASSERT(result, JSON_TEXT("out of memory"));
-		  return result;
-	   #else
-		  return myrealloc(ptr, siz);
-	   #endif
-    }
-    #ifdef JSON_DEBUG  //in debug mode, see if the malloc was successful
-	   void * result = realloc(ptr, siz);
-	   JSON_ASSERT(result, JSON_TEXT("out of memory"));
-	   return result;
+    #ifdef JSON_MEMORY_POOL
+	    return json_generic_mempool.reallocate(ptr, siz);
     #else
-	   return realloc(ptr, siz);
+        if (json_realloc_t callback = JSONSingleton<json_realloc_t>::get()){
+        #if(defined(JSON_DEBUG) && (!defined(JSON_MEMORY_CALLBACKS))) //in debug mode without mem callback, see if the malloc was successful
+	          void * result = callback(ptr, siz);
+	          JSON_ASSERT(result, JSON_TEXT("Out of memory"));
+	          return result;
+           #else
+	          return callback(ptr, siz);
+           #endif
+        }
+        #if(defined(JSON_DEBUG) && (!defined(JSON_MEMORY_CALLBACKS))) //in debug mode without mem callback, see if the malloc was successful
+           void * result = std::realloc(ptr, siz);
+           JSON_ASSERT(result, JSON_TEXT("Out of memory"));
+           return result;
+        #else
+           return std::realloc(ptr, siz);
+        #endif
     #endif
 }
 
-void JSONMemory::json_free(void * ptr) json_nothrow {
-    if (myfree != 0){
-	   myfree(ptr);
-    } else {
-	   free(ptr);
+#ifdef JSON_MEMORY_POOL
+    //it is okay to pass null to these callbacks, no make sure they function exists
+    static void * malloc_proxy(size_t siz) json_nothrow {
+       if (json_malloc_t callback = JSONSingleton<json_malloc_t>::get()){
+	       return callback(siz);
+       }
+       return std::malloc(siz);
+    }
+
+    static void * realloc_proxy(void * ptr, size_t siz) json_nothrow {
+       if (json_realloc_t callback = JSONSingleton<json_realloc_t>::get()){
+          return callback(ptr, siz);
+       }
+       return std::realloc(ptr, siz);
     }
-}
+
+    static void free_proxy(void * ptr){
+        if (json_free_t callback = JSONSingleton<json_free_t>::get()){
+	       callback(ptr);
+        } else {
+	       std::free(ptr);
+        }
+    }
+#endif
+
 
 void JSONMemory::registerMemoryCallbacks(json_malloc_t mal, json_realloc_t real, json_free_t fre) json_nothrow {
-    mymalloc = mal;
-    myrealloc = real;
-    myfree = fre;
+    JSONSingleton<json_malloc_t>::set(mal);
+    JSONSingleton<json_realloc_t>::set(real);
+    JSONSingleton<json_free_t>::set(fre);
+    #ifdef JSON_MEMORY_POOL
+        mempool_callbacks::set(malloc_proxy, realloc_proxy, free_proxy);
+    #endif
 }
 
+
 #endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONMemory.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONMemory.h Changed

@@ -3,7 +3,6 @@
 
 #include <cstdlib> //for malloc, realloc, and free
 #include <cstring> //for memmove
-#include "../JSONOptions.h"
 #include "JSONDebug.h"
 
 #if defined(JSON_DEBUG) || defined(JSON_SAFE)
@@ -12,18 +11,15 @@
     #define JSON_FREE_PASSTYPE
 #endif
 
-#ifdef JSON_MEMORY_CALLBACKS
+#if defined(JSON_MEMORY_CALLBACKS) || defined(JSON_MEMORY_POOL)
     class JSONMemory {
     public:
-	   #ifdef __GNUC__
 		  static void * json_malloc(size_t siz) json_malloc_attr;
-		  static void * json_realloc(void * ptr, size_t siz) json_malloc_attr;
-	   #else
-		  static void * json_malloc(size_t siz) json_nothrow;
-		  static void * json_realloc(void * ptr, size_t siz) json_nothrow;
-	   #endif
+	      static void * json_realloc(void * ptr, size_t siz) json_malloc_attr;
 	   static void json_free(void * ptr) json_nothrow;
 	   static void registerMemoryCallbacks(json_malloc_t mal, json_realloc_t real, json_free_t fre) json_nothrow json_cold;
+    private:
+        JSONMemory(void);
     };
 
     template <typename T> static inline T * json_malloc(size_t count) json_malloc_attr;
@@ -33,7 +29,7 @@
 
     template <typename T> static inline T * json_realloc(T * ptr, size_t count) json_malloc_attr;
     template <typename T> static inline T * json_realloc(T * ptr, size_t count) json_nothrow {
-	   return (T *)JSONMemory::json_realloc(ptr, sizeof(T) * count);
+       return (T *)JSONMemory::json_realloc(ptr, sizeof(T) * count);
     }
 
     template <typename T> static inline void libjson_free(T * JSON_FREE_PASSTYPE ptr) json_nothrow {
@@ -47,19 +43,19 @@
     template <typename T> static inline T * json_malloc(size_t count) json_malloc_attr;
     template <typename T> static inline T * json_malloc(size_t count) json_nothrow {
 	   #ifdef JSON_DEBUG  //in debug mode, see if the malloc was successful
-		  void * result = malloc(count * sizeof(T));
-		  JSON_ASSERT(result != 0, JSON_TEXT("out of memory"));
+		  void * result = std::malloc(count * sizeof(T));
+		  JSON_ASSERT(result != 0, JSON_TEXT("Out of memory"));
 		  #ifdef JSON_NULL_MEMORY
-			 memset(result, '\0', count  * sizeof(T));
+			 std::memset(result, '\0', count  * sizeof(T));
 		  #endif
 		  return (T *)result;
 	   #else
-		  return (T *)malloc(count * sizeof(T));
+		  return (T *)std::malloc(count * sizeof(T));
 	   #endif
     }
 
     template <typename T> static inline void libjson_free(T * JSON_FREE_PASSTYPE ptr) json_nothrow {
-	   free(ptr);
+	   std::free(ptr);
 	   #if defined(JSON_DEBUG) || defined(JSON_SAFE)  //in debug or safe mode, set the pointer to 0 so that it can't be used again
 		  ptr = 0;
 	   #endif
@@ -68,14 +64,11 @@
     template <typename T> static inline T * json_realloc(T * ptr, size_t count) json_malloc_attr;
     template <typename T> static inline T * json_realloc(T * ptr, size_t count) json_nothrow {
 	   #ifdef JSON_DEBUG  //in debug mode, check the results of realloc to be sure it was successful
-		  void * result = realloc(ptr, count * sizeof(T));
-		  JSON_ASSERT(result != 0, JSON_TEXT("out of memory"));
-		  #ifdef JSON_NULL_MEMORY
-			 memset(result, '\0', count  * sizeof(T));
-		  #endif
+		  void * result = std::realloc(ptr, count * sizeof(T));
+		  JSON_ASSERT(result != 0, JSON_TEXT("Out of memory"));
 		  return (T *)result;
 	   #else
-		  return (T *)realloc(ptr, count * sizeof(T));
+		  return (T *)std::realloc(ptr, count * sizeof(T));
 	   #endif
     }
 #endif
@@ -84,45 +77,60 @@
     #include <map>
     class JSONNode;
     struct auto_expand {
-	   auto_expand(void) json_nothrow : mymap(){}
-	   ~auto_expand(void) json_nothrow { purge(); }
+    public:
+		LIBJSON_OBJECT(auto_expand);
+	   auto_expand(void) json_nothrow : mymap(){ LIBJSON_CTOR;}
+	   ~auto_expand(void) json_nothrow { purge(); LIBJSON_DTOR; }
 	   void purge(void) json_nothrow;
 	   inline void clear(void) json_nothrow { purge(); mymap.clear(); }
 	   inline void * insert(void * ptr) json_nothrow { mymap[ptr] = ptr; return ptr; }
 	   inline void remove(void * ptr) json_nothrow {
-		  std::map<void *, void *>::iterator i = mymap.find(ptr);
+		  JSON_MAP(void *, void *)::iterator i = mymap.find(ptr);
 		  JSON_ASSERT(i != mymap.end(), JSON_TEXT("Removing a non-managed item"));
 		  mymap.erase(i);
 	   }
-	   std::map<void *, void *> mymap;
+	   JSON_MAP(void *, void *) mymap;
+    private:
+        auto_expand(const auto_expand &);
+        auto_expand & operator = (const auto_expand &);
     };
 
     struct auto_expand_node {
-	   auto_expand_node(void) json_nothrow : mymap(){}
-	   ~auto_expand_node(void) json_nothrow { purge(); }
+    public:
+		LIBJSON_OBJECT(auto_expand_node);
+	   auto_expand_node(void) json_nothrow : mymap(){ LIBJSON_CTOR; }
+	   ~auto_expand_node(void) json_nothrow { purge(); LIBJSON_DTOR; }
 	   void purge(void) json_nothrow ;
 	   inline void clear(void) json_nothrow { purge(); mymap.clear(); }
 	   inline JSONNode * insert(JSONNode * ptr) json_nothrow { mymap[ptr] = ptr; return ptr; }
 	   inline void remove(void * ptr) json_nothrow {
-		  std::map<void *, JSONNode *>::iterator i = mymap.find(ptr);
+		  JSON_MAP(void *, JSONNode *)::iterator i = mymap.find(ptr);
 		  if(json_likely(i != mymap.end())) mymap.erase(i);
 	   }
-	   std::map<void *, JSONNode *> mymap;
+	   JSON_MAP(void *, JSONNode *) mymap;
+    private:
+        auto_expand_node(const auto_expand_node &);
+        auto_expand_node & operator = (const auto_expand_node &);
     };
 
     #ifdef JSON_STREAM
 	   class JSONStream;
 	   struct auto_expand_stream {
-		  auto_expand_stream(void) json_nothrow : mymap(){}
-		  ~auto_expand_stream(void) json_nothrow { purge(); }
+        public:
+			LIBJSON_OBJECT(auto_expand_stream);
+		  auto_expand_stream(void) json_nothrow : mymap(){ LIBJSON_CTOR; }
+		  ~auto_expand_stream(void) json_nothrow { purge(); LIBJSON_DTOR; }
 		  void purge(void) json_nothrow ;
 		  inline void clear(void) json_nothrow { purge(); mymap.clear(); }
 		  inline JSONStream * insert(JSONStream * ptr) json_nothrow { mymap[ptr] = ptr; return ptr; }
 		  inline void remove(void * ptr) json_nothrow {
-			 std::map<void *, JSONStream *>::iterator i = mymap.find(ptr);
+			 JSON_MAP(void *, JSONStream *)::iterator i = mymap.find(ptr);
 			 if(json_likely(i != mymap.end())) mymap.erase(i);
 		  }
-		  std::map<void *, JSONStream *> mymap;
+		  JSON_MAP(void *, JSONStream *) mymap;
+        private:
+            auto_expand_stream(const auto_expand_stream &);
+            auto_expand_stream & operator = (const auto_expand_stream &);
 	   };
     #endif
 #endif
@@ -131,10 +139,13 @@
 template <typename T>
 class json_auto {
     public:
-	   json_auto(void) json_nothrow : ptr(0){}
-	   json_auto(size_t count) json_nothrow : ptr(json_malloc<T>(count)){}
+		LIBJSON_OBJECT(json_auto);
+	   json_auto(void) json_nothrow : ptr(0){ LIBJSON_CTOR; }
+	   json_auto(size_t count) json_nothrow : ptr(json_malloc<T>(count)){ LIBJSON_CTOR; }
+	   json_auto(T * arg) json_nothrow : ptr(arg){ LIBJSON_CTOR; }
 	   ~json_auto(void) json_nothrow {
 		  libjson_free<T>(ptr);
+		  LIBJSON_DTOR;
 	   }
 	   inline void set(T * p) json_nothrow{
 		  ptr = p;
@@ -155,13 +166,10 @@
 }
 
 //Shrinks a string
-#ifdef JSON_LESS_MEMORY
-    static inline json_string shrinkString(const json_string & str) json_nothrow {
-	   if (str.capacity() == str.length()) return str;
-	   return json_string(str.c_str());
-    }
-#else
-    #define shrinkString(str) str
-#endif
+static inline void shrinkString(json_string & str) json_nothrow {
+    #ifdef JSON_LESS_MEMORY
+        if (str.capacity() != str.length()) str = json_string(str.begin(), str.end());
+    #endif
+}
 
 #endif

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONMemoryPool.h Added

@@ -0,0 +1,38 @@
+#ifndef LIBJSON_GUARD_MEMORY_POOL_H
+#define LIBJSON_GUARD_MEMORY_POOL_H
+
+#ifdef JSON_MEMORY_POOL
+
+#include "../Dependencies/mempool++/mempool.h"
+
+//this macro expands to the number of bytes a pool gets based on block size and number of 32s of the total pool it gets
+#define jsonPoolPart(bytes_per_block, thirty_seconds_of_mem) bytes_per_block, ((thirty_seconds_of_mem * JSON_MEMORY_POOL / 32) / bytes_per_block)
+
+#ifdef JSON_PREPARSE
+	#define NODEPOOL jsonPoolPart(sizeof(JSONNode), 1)
+	#define INTERNALNODEPOOL jsonPoolPart(sizeof(internalJSONNode), 3)
+	#define MEMPOOL_1 jsonPoolPart(8, 2)
+	#define MEMPOOL_2 jsonPoolPart(16, 2)
+	#define MEMPOOL_3 jsonPoolPart(32, 2)
+	#define MEMPOOL_4 jsonPoolPart(64, 2)
+	#define MEMPOOL_5 jsonPoolPart(128, 3)
+	#define MEMPOOL_6 jsonPoolPart(256, 4)
+	#define MEMPOOL_7 jsonPoolPart(512, 5)
+	#define MEMPOOL_8 jsonPoolPart(4096, 8)
+#else
+	#define NODEPOOL jsonPoolPart(sizeof(JSONNode), 2)
+	#define INTERNALNODEPOOL jsonPoolPart(sizeof(internalJSONNode), 7)
+	#define MEMPOOL_1 jsonPoolPart(8, 1)
+	#define MEMPOOL_2 jsonPoolPart(16, 1)
+	#define MEMPOOL_3 jsonPoolPart(32, 1)
+	#define MEMPOOL_4 jsonPoolPart(64, 1)
+	#define MEMPOOL_5 jsonPoolPart(128, 3)
+	#define MEMPOOL_6 jsonPoolPart(256, 3)
+	#define MEMPOOL_7 jsonPoolPart(512, 5)
+	#define MEMPOOL_8 jsonPoolPart(4096, 8)
+#endif
+
+#endif
+
+#endif
+

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONNode.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONNode.cpp Changed

@@ -1,31 +1,10 @@
 #include "JSONNode.h"
 
-#ifdef JSON_UNIT_TEST
-    int allocCount(0);
-    int deallocCount(0);
-    int internalAllocCount(0);
-    int internalDeallocCount(0);
-    int childrenAllocCount(0);
-    int childrenDeallocCount(0);
-    int JSONNode::getNodeAllocationCount(void){ return allocCount; }
-    int JSONNode::getNodeDeallocationCount(void){ return deallocCount; }
-    int JSONNode::getInternalAllocationCount(void){ return internalAllocCount; }
-    int JSONNode::getInternalDeallocationCount(void){ return internalDeallocCount; }
-    int JSONNode::getChildrenAllocationCount(void){ return childrenAllocCount; }
-    int JSONNode::getChildrenDeallocationCount(void){ return childrenDeallocCount; }
-    void JSONNode::incAllocCount(void){ ++allocCount; }
-    void JSONNode::decAllocCount(void){ ++deallocCount; }
-    void JSONNode::incinternalAllocCount(void){ ++internalAllocCount; }
-    void JSONNode::decinternalAllocCount(void){ ++internalDeallocCount; }
-    void JSONNode::incChildrenAllocCount(void){ ++childrenAllocCount; }
-    void JSONNode::decChildrenAllocCount(void){ ++childrenDeallocCount; }
-#endif
-
 #define IMPLEMENT_CTOR(type)\
     JSONNode::JSONNode(const json_string & name_t, type value_t) json_nothrow : internal(internalJSONNode::newInternal()){\
 	   internal -> Set(value_t);\
 	   internal -> setname(name_t);\
-	   incAllocCount();\
+	   LIBJSON_CTOR;\
     }
 IMPLEMENT_FOR_ALL_TYPES(IMPLEMENT_CTOR)
 
@@ -33,77 +12,102 @@
     JSONNode::JSONNode(const json_string & name_t, const json_char * value_t) json_nothrow : internal(internalJSONNode::newInternal()){
 	   internal -> Set(json_string(value_t));
 	   internal -> setname(name_t);
-	   incAllocCount();
+	   LIBJSON_CTOR;
     }
 #endif
 
-JSONNode JSONNode::as_node(void) const json_nothrow {
-    JSON_CHECK_INTERNAL();
-    if (type() == JSON_NODE){
-	   return *this;
-    } else if (type() == JSON_ARRAY){
-	   JSONNode res(duplicate());
-	   res.internal -> _type = JSON_NODE;
-	   return res;
+#if (defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY))
+    #include "JSONWorker.h"
+    JSONNode JSONNode::stringType(const json_string & str){
+        JSONNode res;
+        res.set_name(json_global(EMPTY_JSON_STRING));
+        #ifdef JSON_LESS_MEMORY
+            res = JSONWorker::FixString(str, res.internal, false);
+        #else
+            res = JSONWorker::FixString(str, res.internal -> _string_encoded);
+        #endif
+        return res;
     }
-    #ifdef JSON_MUTEX_CALLBACKS
-	   if (internal -> mylock != 0){
-		  JSONNode res(JSON_NODE);
-		  res.set_mutex(internal -> mylock);
-		  return res;
-	   }
-    #endif
-    return JSONNode(JSON_NODE);
-}
 
-JSONNode JSONNode::as_array(void) const json_nothrow {
-    JSON_CHECK_INTERNAL();
-    if (type() == JSON_ARRAY){
-	   return *this;
-    } else if (type() == JSON_NODE){
-	   JSONNode res(duplicate());
-	   res.internal -> _type = JSON_ARRAY;
-	   json_foreach(res.internal -> CHILDREN, runner){
-		  (*runner) -> clear_name();
+    void JSONNode::set_name_(const json_string & newname) json_nothrow {
+        #ifdef JSON_LESS_MEMORY
+            json_string _newname = JSONWorker::FixString(newname, internal, true);
+        #else
+            json_string _newname = JSONWorker::FixString(newname, internal -> _name_encoded);
+        #endif
+        set_name(_newname);
+    }
+#endif
+
+#ifdef JSON_CASTABLE
+    JSONNode JSONNode::as_node(void) const json_nothrow {
+	   JSON_CHECK_INTERNAL();
+	   if (type() == JSON_NODE){
+		  return *this;
+	   } else if (type() == JSON_ARRAY){
+		  JSONNode res(duplicate());
+		  res.internal -> _type = JSON_NODE;
+		  return res;
 	   }
-	   return res;
+	   #ifdef JSON_MUTEX_CALLBACKS
+		  if (internal -> mylock != 0){
+			 JSONNode res(JSON_NODE);
+			 res.set_mutex(internal -> mylock);
+			 return res;
+		  }
+	   #endif
+	   return JSONNode(JSON_NODE);
     }
-    #ifdef JSON_MUTEX_CALLBACKS
-	   if (internal -> mylock != 0){
-		  JSONNode res(JSON_ARRAY);
-		  res.set_mutex(internal -> mylock);
+
+    JSONNode JSONNode::as_array(void) const json_nothrow {
+	   JSON_CHECK_INTERNAL();
+	   if (type() == JSON_ARRAY){
+		  return *this;
+	   } else if (type() == JSON_NODE){
+		  JSONNode res(duplicate());
+		  res.internal -> _type = JSON_ARRAY;
+		  json_foreach(res.internal -> CHILDREN, runner){
+			 (*runner) -> clear_name();
+		  }
 		  return res;
 	   }
-    #endif
-    return JSONNode(JSON_ARRAY);
-}
+	   #ifdef JSON_MUTEX_CALLBACKS
+		  if (internal -> mylock != 0){
+			 JSONNode res(JSON_ARRAY);
+			 res.set_mutex(internal -> mylock);
+			 return res;
+		  }
+	   #endif
+	   return JSONNode(JSON_ARRAY);
+    }
 
-void JSONNode::cast(char newtype) json_nothrow {
-    JSON_CHECK_INTERNAL();
-    if (newtype == type()) return;
+    void JSONNode::cast(char newtype) json_nothrow {
+	   JSON_CHECK_INTERNAL();
+	   if (newtype == type()) return;
 
-    switch(newtype){
-	   case JSON_NULL:
-		  nullify();
-		  return;
-	   case JSON_STRING:
-		  *this = as_string();
-		  return;
-	   case JSON_NUMBER:
-		  *this = as_float();
-		  return;
-	   case JSON_BOOL:
-		  *this = as_bool();
-		  return;
-	   case JSON_ARRAY:
-		  *this = as_array();
-		  return;
-	   case JSON_NODE:
-		  *this = as_node();
-		  return;
+	   switch(newtype){
+		  case JSON_NULL:
+			 nullify();
+			 return;
+		  case JSON_STRING:
+			 *this = as_string();
+			 return;
+		  case JSON_NUMBER:
+			 *this = as_float();
+			 return;
+		  case JSON_BOOL:
+			 *this = as_bool();
+			 return;
+		  case JSON_ARRAY:
+			 *this = as_array();
+			 return;
+		  case JSON_NODE:
+			 *this = as_node();
+			 return;
+	   }
+	   JSON_FAIL(JSON_TEXT("cast to unknown type"));
     }
-    JSON_FAIL(JSON_TEXT("cast to unknown type"));
-}
+#endif
 
 //different just to supress the warning
 #ifdef JSON_REF_COUNT
@@ -161,7 +165,7 @@
     JSON_CHECK_INTERNAL();
     if (json_unlikely(pos >= internal -> size())){
 	   JSON_FAIL(JSON_TEXT("at() out of bounds"));
-	   json_throw(std::out_of_range(EMPTY_STD_STRING));
+	   json_throw(std::out_of_range(json_global(EMPTY_STD_STRING)));
     }
     return (*this)[pos];
 }
@@ -170,7 +174,7 @@
     JSON_CHECK_INTERNAL();
     if (json_unlikely(pos >= internal -> size())){
 	   JSON_FAIL(JSON_TEXT("at() const out of bounds"));
-	   json_throw(std::out_of_range(EMPTY_STD_STRING));
+	   json_throw(std::out_of_range(json_global(EMPTY_STD_STRING)));
     }
     return (*this)[pos];
 }
@@ -190,45 +194,45 @@
 
 JSONNode & JSONNode::at(const json_string & name_t) json_throws(std::out_of_range) {
     JSON_CHECK_INTERNAL();
-    JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("at a non-iteratable node"));
+    JSON_ASSERT(type() == JSON_NODE, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("at"));
     makeUniqueInternal();
     if (JSONNode ** res = internal -> at(name_t)){
 	   return *(*res);
     }
     JSON_FAIL(json_string(JSON_TEXT("at could not find child by name: ")) + name_t);
-    json_throw(std::out_of_range(EMPTY_STD_STRING));
+    json_throw(std::out_of_range(json_global(EMPTY_STD_STRING)));
 }
 
 const JSONNode & JSONNode::at(const json_string & name_t) const json_throws(std::out_of_range) {
     JSON_CHECK_INTERNAL();
-    JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("at a non-iteratable node"));
+    JSON_ASSERT(type() == JSON_NODE, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("at"));
     if (JSONNode ** res = internal -> at(name_t)){
 	   return *(*res);
     }
     JSON_FAIL(json_string(JSON_TEXT("at const could not find child by name: ")) + name_t);
-    json_throw(std::out_of_range(EMPTY_STD_STRING));
+    json_throw(std::out_of_range(json_global(EMPTY_STD_STRING)));
 }
 
 #ifdef JSON_CASE_INSENSITIVE_FUNCTIONS
     JSONNode & JSONNode::at_nocase(const json_string & name_t) json_throws(std::out_of_range) {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("at a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("at_nocase"));
 	   makeUniqueInternal();
 	   if (JSONNode ** res = internal -> at_nocase(name_t)){
 		  return *(*res);
 	   }
 	   JSON_FAIL(json_string(JSON_TEXT("at_nocase could not find child by name: ")) + name_t);
-	   json_throw(std::out_of_range(EMPTY_STD_STRING));
+	   json_throw(std::out_of_range(json_global(EMPTY_STD_STRING)));
     }
 
     const JSONNode & JSONNode::at_nocase(const json_string & name_t) const json_throws(std::out_of_range) {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("at a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("at_nocase"));
 	   if (JSONNode ** res = internal -> at_nocase(name_t)){
 		  return *(*res);
 	   }
 	   JSON_FAIL(json_string(JSON_TEXT("at_nocase const could not find child by name: ")) + name_t);
-	   json_throw(std::out_of_range(EMPTY_STD_STRING));
+	   json_throw(std::out_of_range(json_global(EMPTY_STD_STRING)));
     }
 #endif
 
@@ -248,7 +252,7 @@
     JSON_CHECK_INTERNAL();
     if (json_unlikely(pos >= internal -> size())){
 	   JSON_FAIL(JSON_TEXT("pop_back out of bounds"));
-	   json_throw(std::out_of_range(EMPTY_STD_STRING));
+	   json_throw(std::out_of_range(json_global(EMPTY_STD_STRING)));
     }
     makeUniqueInternal();
     #ifdef JSON_LIBRARY
@@ -261,7 +265,7 @@
 
 JSONNode JSON_PTR_LIB JSONNode::pop_back(const json_string & name_t) json_throws(std::out_of_range) {
     JSON_CHECK_INTERNAL();
-    JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("popping a non-iteratable node"));
+    JSON_ASSERT(type() == JSON_NODE, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("pop_back"));
     #ifdef JSON_LIBRARY
 	   return internal -> pop_back(name_t);
     #else
@@ -270,14 +274,14 @@
 		  return *(temp.mynode);
 	   }
 	   JSON_FAIL(json_string(JSON_TEXT("pop_back const could not find child by name: ")) + name_t);
-	   json_throw(std::out_of_range(EMPTY_STD_STRING));
+	   json_throw(std::out_of_range(json_global(EMPTY_STD_STRING)));
     #endif
 }
 
 #ifdef JSON_CASE_INSENSITIVE_FUNCTIONS
     JSONNode JSON_PTR_LIB JSONNode::pop_back_nocase(const json_string & name_t) json_throws(std::out_of_range) {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("popping a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("pop_back_no_case"));
 	   #ifdef JSON_LIBRARY
 		  return internal -> pop_back_nocase(name_t);
 	   #else
@@ -286,8 +290,67 @@
 			 return *(temp.mynode);
 		  }
 		  JSON_FAIL(json_string(JSON_TEXT("pop_back_nocase could not find child by name: ")) + name_t);
-		  json_throw(std::out_of_range(EMPTY_STD_STRING));
+		  json_throw(std::out_of_range(json_global(EMPTY_STD_STRING)));
 	   #endif
     }
 #endif
+		
+#ifdef JSON_MEMORY_POOL
+	#include "JSONMemoryPool.h"
+	memory_pool<NODEPOOL> json_node_mempool;
+#endif
+		
+void JSONNode::deleteJSONNode(JSONNode * ptr) json_nothrow {
+	#ifdef JSON_MEMORY_POOL
+		ptr -> ~JSONNode();
+		json_node_mempool.deallocate((void*)ptr);
+	#elif defined(JSON_MEMORY_CALLBACKS)
+		ptr -> ~JSONNode();
+		libjson_free<JSONNode>(ptr);
+	#else
+		delete ptr;
+	#endif
+}
+		
+inline JSONNode * _newJSONNode(const JSONNode & orig) {
+	#ifdef JSON_MEMORY_POOL
+		return new((JSONNode*)json_node_mempool.allocate()) JSONNode(orig);
+	#elif defined(JSON_MEMORY_CALLBACKS)
+		return new(json_malloc<JSONNode>(1)) JSONNode(orig);
+	#else
+		return new JSONNode(orig);
+	#endif
+}
+		
+JSONNode * JSONNode::newJSONNode(const JSONNode & orig    JSON_MUTEX_COPY_DECL) {
+	#ifdef JSON_MUTEX_CALLBACKS
+		if (parentMutex != 0){
+			JSONNode * temp = _newJSONNode(orig);
+			temp -> set_mutex(parentMutex);
+			return temp;
+		}
+	#endif
+	return _newJSONNode(orig);
+}
+		
+JSONNode * JSONNode::newJSONNode(internalJSONNode * internal_t) {
+	#ifdef JSON_MEMORY_POOL
+		return new((JSONNode*)json_node_mempool.allocate()) JSONNode(internal_t);
+	#elif defined(JSON_MEMORY_CALLBACKS)
+		return new(json_malloc<JSONNode>(1)) JSONNode(internal_t);
+	#else
+		return new JSONNode(internal_t);
+	#endif
+}
+		
+JSONNode * JSONNode::newJSONNode_Shallow(const JSONNode & orig) {
+	#ifdef JSON_MEMORY_POOL
+		return new((JSONNode*)json_node_mempool.allocate()) JSONNode(true, const_cast<JSONNode &>(orig));
+	#elif defined(JSON_MEMORY_CALLBACKS)
+		return new(json_malloc<JSONNode>(1)) JSONNode(true, const_cast<JSONNode &>(orig));
+	#else
+		return new JSONNode(true, const_cast<JSONNode &>(orig));
+	#endif
+}
+

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONNode.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONNode.h Changed

@@ -131,12 +131,18 @@
 
 class JSONNode {
 public:
+	LIBJSON_OBJECT(JSONNode);
     explicit JSONNode(char mytype = JSON_NODE) json_nothrow json_hot;
     #define DECLARE_CTOR(type) explicit JSONNode(const json_string & name_t, type value_t)
     DECLARE_FOR_ALL_TYPES(DECLARE_CTOR)
 
     JSONNode(const JSONNode & orig) json_nothrow json_hot;
     ~JSONNode(void) json_nothrow json_hot;
+    
+    #if (defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY))
+        static JSONNode stringType(const json_string & str);
+        void set_name_(const json_string & newname) json_nothrow json_write_priority;
+    #endif
 
     json_index_t size(void) const json_nothrow json_read_priority;
     bool empty(void) const json_nothrow json_read_priority;
@@ -153,15 +159,18 @@
 	   void preparse(void) json_nothrow json_read_priority;
     #endif
 
-    //#ifdef JSON_DEPRECATED_FUNCTIONS
-	   json_string as_string(void) const json_nothrow json_read_priority;
-	   long as_int(void) const json_nothrow json_read_priority;
-	   json_number as_float(void) const json_nothrow json_read_priority;
-	   bool as_bool(void) const json_nothrow json_read_priority;
-    //#endif
-    JSONNode as_node(void) const json_nothrow json_read_priority;
-    JSONNode as_array(void) const json_nothrow json_read_priority;
 
+    json_string as_string(void) const json_nothrow json_read_priority;
+    json_int_t as_int(void) const json_nothrow json_read_priority;
+    json_number as_float(void) const json_nothrow json_read_priority;
+    bool as_bool(void) const json_nothrow json_read_priority;
+    
+    #ifdef JSON_CASTABLE
+	   JSONNode as_node(void) const json_nothrow json_read_priority;
+	   JSONNode as_array(void) const json_nothrow json_read_priority;
+	   void cast(char newtype) json_nothrow;
+    #endif
+    
     #ifdef JSON_BINARY
 	   std::string as_binary(void) const json_nothrow json_cold;
 	   void set_binary(const unsigned char * bin, size_t bytes) json_nothrow json_cold;
@@ -206,7 +215,6 @@
     void merge(JSONNode & other) json_nothrow json_cold;
     void merge(unsigned int num, ...) json_nothrow json_cold;
     JSONNode duplicate(void) const json_nothrow;
-    void cast(char newtype) json_nothrow;
 
 
     //iterator
@@ -498,24 +506,16 @@
 	   static void * getThisLock(JSONNode * pthis) json_nothrow json_cold;
     #endif
 
-    #ifdef JSON_UNIT_TEST
-	   static int getNodeAllocationCount(void);
-	   static int getNodeDeallocationCount(void);
-	   static int getInternalAllocationCount(void);
-	   static int getInternalDeallocationCount(void);
-	   static int getChildrenAllocationCount(void);
-	   static int getChildrenDeallocationCount(void);
-	   static void incAllocCount(void);
-	   static void decAllocCount(void);
-	   static void incinternalAllocCount(void);
-	   static void decinternalAllocCount(void);
-	   static void incChildrenAllocCount(void);
-	   static void decChildrenAllocCount(void);
-    #endif
-
     #ifdef JSON_WRITE_PRIORITY
-	   json_string write(void) const json_nothrow json_write_priority;
-	   json_string write_formatted(void) const json_nothrow json_write_priority;
+		#ifdef JSON_LESS_MEMORY
+			#define DEFAULT_APPROX_SIZE 8
+			#define DEFAULT_APPROX_SIZE_FORMATTED 16
+		#else
+			#define DEFAULT_APPROX_SIZE 1024
+			#define DEFAULT_APPROX_SIZE_FORMATTED 2048
+		#endif
+	   json_string write(size_t approxsize = DEFAULT_APPROX_SIZE) const json_nothrow json_write_priority;
+	   json_string write_formatted(size_t approxsize = DEFAULT_APPROX_SIZE_FORMATTED) const json_nothrow json_write_priority;
     #endif
 
     #ifdef JSON_DEBUG
@@ -534,11 +534,11 @@
     #ifdef JSON_READ_PRIORITY
 	   //used by JSONWorker
 	   JSONNode(const json_string & unparsed) json_nothrow : internal(internalJSONNode::newInternal(unparsed)){ //root, specialized because it can only be array or node
-		  incAllocCount();
+		  LIBJSON_CTOR;
 	   }
     #endif
     JSONNode(internalJSONNode * internal_t) json_nothrow : internal(internal_t){ //do not increment anything, this is only used in one case and it's already taken care of
-	   incAllocCount();
+	   LIBJSON_CTOR;
     }
     JSONNode(bool, JSONNode & orig) json_nothrow json_hot;
 
@@ -595,22 +595,22 @@
 			 (mytype == JSON_BOOL) ||
 			 (mytype == JSON_ARRAY) ||
 			 (mytype == JSON_NODE), JSON_TEXT("Not a proper JSON type"));
-    incAllocCount();
+    LIBJSON_CTOR;
 }
 
 inline JSONNode::JSONNode(const JSONNode & orig) json_nothrow : internal(orig.internal -> incRef()){
-    incAllocCount();
+    LIBJSON_COPY_CTOR;
 }
 
 //this allows a temp node to simply transfer its contents, even with ref counting off
 inline JSONNode::JSONNode(bool, JSONNode & orig) json_nothrow : internal(orig.internal){
     orig.internal = 0;
-    incAllocCount();
+    LIBJSON_CTOR;
 }
 
 inline JSONNode::~JSONNode(void) json_nothrow{
     if (internal != 0) decRef();
-    decAllocCount();
+    LIBJSON_DTOR;
 }
 
 inline json_index_t JSONNode::size(void) const json_nothrow {
@@ -671,7 +671,6 @@
 	   return static_cast<json_int_t>(*internal);
     }
 
-#include <cstdio>
     inline json_number JSONNode::as_float(void) const json_nothrow {
 	   JSON_CHECK_INTERNAL();
 	   return static_cast<json_number>(*internal);
@@ -690,7 +689,7 @@
     }
 
     inline std::string JSONNode::as_binary(void) const json_nothrow {
-	   JSON_ASSERT_SAFE(type() == JSON_STRING, JSON_TEXT("using as_binary for a non-string type"), return EMPTY_STD_STRING;);
+	   JSON_ASSERT_SAFE(type() == JSON_STRING, JSON_TEXT("using as_binary for a non-string type"), return json_global(EMPTY_STD_STRING););
 	   JSON_CHECK_INTERNAL();
 	   return JSONBase64::json_decode64(as_string());
     }
@@ -742,6 +741,7 @@
 
 #define NODE_SET_TYPED(type)\
     inline JSONNode & JSONNode::operator = (type val) json_nothrow {\
+		LIBJSON_ASSIGNMENT;\
 	   JSON_CHECK_INTERNAL();\
 	   makeUniqueInternal();\
 	   internal -> Set(val);\
@@ -837,14 +837,14 @@
 #ifdef JSON_ITERATORS
     inline JSONNode::json_iterator JSONNode::begin(void) json_nothrow {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("iterating a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("begin"));
 	   makeUniqueInternal();
 	   return json_iterator(internal -> begin());
     }
 
     inline JSONNode::json_iterator JSONNode::end(void) json_nothrow {
 	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("iterating a non-iteratable node"));
+	   JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("end"));
 	   makeUniqueInternal();
 	   return json_iterator(internal -> end());
     }
@@ -852,39 +852,39 @@
     #ifndef JSON_LIBRARY
 	   inline JSONNode::const_iterator JSONNode::begin(void) const json_nothrow {
 		  JSON_CHECK_INTERNAL();
-		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("iterating a non-iteratable node"));
+		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("begin"));
 		  return JSONNode::const_iterator(internal -> begin());
 	   }
 
 	   inline JSONNode::const_iterator JSONNode::end(void) const json_nothrow {
 		  JSON_CHECK_INTERNAL();
-		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("iterating a non-iteratable node"));
+		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("end"));
 		  return JSONNode::const_iterator(internal -> end());
 	   }
 
 	   inline JSONNode::reverse_iterator JSONNode::rbegin(void) json_nothrow {
 		  JSON_CHECK_INTERNAL();
-		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("iterating a non-iteratable node"));
+		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("rbegin"));
 		  makeUniqueInternal();
 		  return JSONNode::reverse_iterator(internal -> end() - 1);
 	   }
 
 	   inline JSONNode::reverse_iterator JSONNode::rend(void) json_nothrow {
 		  JSON_CHECK_INTERNAL();
-		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("iterating a non-iteratable node"));
+		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("rend"));
 		  makeUniqueInternal();
 		  return JSONNode::reverse_iterator(internal -> begin() - 1);
 	   }
 
 	   inline JSONNode::reverse_const_iterator JSONNode::rbegin(void) const json_nothrow {
 		  JSON_CHECK_INTERNAL();
-		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("iterating a non-iteratable node"));
+		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("rbegin"));
 		  return JSONNode::reverse_const_iterator(internal -> end() - 1);
 	   }
 
 	   inline JSONNode::reverse_const_iterator JSONNode::rend(void) const json_nothrow {
 		  JSON_CHECK_INTERNAL();
-		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("iterating a non-iteratable node"));
+		  JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, json_global(ERROR_NON_ITERATABLE) + JSON_TEXT("rend"));
 		  return JSONNode::reverse_const_iterator(internal -> begin() - 1);
 	   }
 
@@ -923,16 +923,22 @@
 #endif
 
 #ifdef JSON_WRITE_PRIORITY
-    inline json_string JSONNode::write(void) const json_nothrow {
-	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT_SAFE(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("Writing a non-writable node"), return EMPTY_JSON_STRING;);
-	   return internal -> Write(0xFFFFFFFF, true);
+    inline json_string JSONNode::write(size_t approxsize) const json_nothrow {
+	    JSON_CHECK_INTERNAL();
+	    JSON_ASSERT_SAFE(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("Writing a non-writable node"), return json_global(EMPTY_JSON_STRING););
+		json_string result;
+		result.reserve(approxsize);
+		internal -> Write(0xFFFFFFFF, true, result);
+		return result;
     }
 
-    inline json_string JSONNode::write_formatted(void) const json_nothrow {
-	   JSON_CHECK_INTERNAL();
-	   JSON_ASSERT_SAFE(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("Writing a non-writable node"), return EMPTY_JSON_STRING;);
-	   return internal -> Write(0, true);
+    inline json_string JSONNode::write_formatted(size_t approxsize) const json_nothrow {
+	    JSON_CHECK_INTERNAL();
+	    JSON_ASSERT_SAFE(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("Writing a non-writable node"), return json_global(EMPTY_JSON_STRING););
+		json_string result;
+		result.reserve(approxsize);
+		internal -> Write(0, true, result);
+		return result;
     }
 
 #endif
@@ -969,52 +975,6 @@
     #endif
 #endif
 
-
-inline void JSONNode::deleteJSONNode(JSONNode * ptr) json_nothrow {
-    #ifdef JSON_MEMORY_CALLBACKS
-	   ptr -> ~JSONNode();
-	   libjson_free<JSONNode>(ptr);
-    #else
-	   delete ptr;
-    #endif
-}
-
-inline JSONNode * _newJSONNode(const JSONNode & orig) {
-    #ifdef JSON_MEMORY_CALLBACKS
-	   return new(json_malloc<JSONNode>(1)) JSONNode(orig);
-    #else
-	   return new JSONNode(orig);
-    #endif
-}
-
-inline JSONNode * JSONNode::newJSONNode(const JSONNode & orig    JSON_MUTEX_COPY_DECL) {
-    #ifdef JSON_MUTEX_CALLBACKS
-	   if (parentMutex != 0){
-		  JSONNode * temp = _newJSONNode(orig);
-		  temp -> set_mutex(parentMutex);
-		  return temp;
-	   }
-    #endif
-    return _newJSONNode(orig);
-}
-
-inline JSONNode * JSONNode::newJSONNode(internalJSONNode * internal_t) {
-    #ifdef JSON_MEMORY_CALLBACKS
-	   return new(json_malloc<JSONNode>(1)) JSONNode(internal_t);
-    #else
-	   return new JSONNode(internal_t);
-    #endif
-}
-
-inline JSONNode * JSONNode::newJSONNode_Shallow(const JSONNode & orig) {
-    #ifdef JSON_MEMORY_CALLBACKS
-	   return new(json_malloc<JSONNode>(1)) JSONNode(true, const_cast<JSONNode &>(orig));
-    #else
-	   return new JSONNode(true, const_cast<JSONNode &>(orig));
-    #endif
-}
-
-
 #ifdef JSON_LESS_MEMORY
     #ifdef __GNUC__
 	   #pragma pack(pop)

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONNode_Mutex.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONNode_Mutex.cpp Changed

@@ -1,35 +1,47 @@
 #include "JSONNode.h"
+#include "JSONGlobals.h"
 
 #ifdef JSON_MUTEX_CALLBACKS
 
-json_mutex_callback_t json_lock_callback(0);
-json_mutex_callback_t json_unlock_callback(0);
-void * global_mutex(0);
-void * manager_mutex(0);
+json_mutex_callback_t json_lock_callback = 0;
+json_mutex_callback_t json_unlock_callback = 0;
+void * global_mutex = 0;
+void * manager_mutex = 0;
 
 struct AutoLock {
+public:
+	LIBJSON_OBJECT(AutoLock);
     AutoLock(void) json_nothrow {
+		LIBJSON_CTOR;
 	   json_lock_callback(manager_mutex);
     }
     ~AutoLock(void) json_nothrow {
+		LIBJSON_DTOR;
 	   json_unlock_callback(manager_mutex);
     }
+private:
+    AutoLock(const AutoLock &);
+    AutoLock & operator = (const AutoLock &);
 };
 
-#include <map>
 #ifdef JSON_MUTEX_MANAGE
     json_mutex_callback_t json_destroy = 0;
-    std::map<void *, unsigned int> mutex_manager;
 
     //make sure that the global mutex is taken care of too
     struct auto_global {
-	   auto_global(void) json_nothrow {}
+    public:
+		LIBJSON_OBJECT(auto_global;)
+	   auto_global(void) json_nothrow { LIBJSON_CTOR; }
 	   ~auto_global(void) json_nothrow {
+		  LIBJSON_DTOR;
 		  if (global_mutex){
 			 JSON_ASSERT_SAFE(json_destroy != 0, JSON_TEXT("No json_destroy in mutex managed mode"), return;);
 			 json_destroy(global_mutex);
 		  }
 	   }
+    private:
+        auto_global(const auto_global &);
+        auto_global & operator = (const auto_global &);
     };
     auto_global cleanupGlobal;
 #endif
@@ -49,8 +61,6 @@
     internal -> _set_mutex(mutex);
 }
 
-std::map<int, std::map<void *, unsigned int> > threadlocks;
-
 void * JSONNode::getThisLock(JSONNode * pthis) json_nothrow {
     if (pthis -> internal -> mylock != 0){
 	   return pthis -> internal -> mylock;
@@ -71,20 +81,20 @@
     #endif
 
     //make sure that the same thread isn't locking it more than once (possible due to complex ref counting)
-    std::map<int, std::map<void *, unsigned int> >::iterator it = threadlocks.find(thread);
-    if (it == threadlocks.end()){
-	   std::map<void *, unsigned int> newthread;
-	   newthread[thislock] = 1;
-	   threadlocks.insert(std::pair<int, std::map<void *, unsigned int> >(thread, newthread));
+    JSON_MAP(int, JSON_MAP(void *, unsigned int) )::iterator it = json_global(THREAD_LOCKS).find(thread);
+    if (it == json_global(THREAD_LOCKS).end()){
+		JSON_MAP(void *, unsigned int) newthread;
+		newthread[thislock] = 1;
+		json_global(THREAD_LOCKS).insert(std::pair<int, JSON_MAP(void *, unsigned int) >(thread, newthread));
     } else {  //this thread already has some things locked, check if the current mutex is
-	   std::map<void *, unsigned int> & newthread = it -> second;
-	   std::map<void *, unsigned int>::iterator locker(newthread.find(thislock));
-	   if (locker == newthread.end()){  //current mutex is not locked, set it to locked
-		  newthread.insert(std::pair<void *, unsigned int>(thislock, 1));
-	   } else {  //it's already locked, don't relock it
-		  ++(locker -> second);
-		  return;  //don't try to relock, it will deadlock the program
-	   }
+		JSON_MAP(void *, unsigned int) & newthread = it -> second;
+		JSON_MAP(void *, unsigned int)::iterator locker(newthread.find(thislock));
+		if (locker == newthread.end()){  //current mutex is not locked, set it to locked
+			newthread.insert(std::pair<void *, unsigned int>(thislock, 1));
+		} else {  //it's already locked, don't relock it
+			++(locker -> second);
+			return;  //don't try to relock, it will deadlock the program
+		}
     }
 
     //if I need to, lock it
@@ -93,30 +103,31 @@
 
 void JSONNode::unlock(int thread) json_nothrow{
     JSON_ASSERT_SAFE(json_unlock_callback != 0, JSON_TEXT("No unlocking callback"), return;);
-
+	
     AutoLock lockControl;
-
+	
     //first, figure out what needs to be locked
     void * thislock = getThisLock(this);
-    #ifdef JSON_SAFE
-	   if (thislock == 0) return;
-    #endif
-
+	#ifdef JSON_SAFE
+		if (thislock == 0) return;
+	#endif
+	
     //get it out of the map
-    std::map<int, std::map<void *, unsigned int> >::iterator it = threadlocks.find(thread);
-    JSON_ASSERT_SAFE(it != threadlocks.end(), JSON_TEXT("thread unlocking something it didn't lock"), return;);
-
+    JSON_MAP(int, JSON_MAP(void *, unsigned int) )::iterator it = json_global(THREAD_LOCKS).find(thread);
+    JSON_ASSERT_SAFE(it != json_global(THREAD_LOCKS).end(), JSON_TEXT("thread unlocking something it didn't lock"), return;);
+	
     //get the mutex out of the thread
-    std::map<void *, unsigned int> & newthread = it -> second;
-    std::map<void *, unsigned int>::iterator locker = newthread.find(thislock);
+    JSON_MAP(void *, unsigned int) & newthread = it -> second;
+    JSON_MAP(void *, unsigned int)::iterator locker = newthread.find(thislock);
     JSON_ASSERT_SAFE(locker != newthread.end(), JSON_TEXT("thread unlocking mutex it didn't lock"), return;);
-
+	
     //unlock it
     if (--(locker -> second)) return;  //other nodes is this same thread still have a lock on it
-
+	
     //if I need to, unlock it
     newthread.erase(locker);
     json_unlock_callback(thislock);
+	
 }
 
 #ifdef JSON_MUTEX_MANAGE
@@ -131,9 +142,9 @@
     mylock = mutex;
     if (mutex != 0){
 	   #ifdef JSON_MUTEX_MANAGE
-		  std::map<void *, unsigned int>::iterator it = mutex_manager.find(mutex);
-		  if (it == mutex_manager.end()){
-			 mutex_manager.insert(std::pair<void *, unsigned int>(mutex, 1));
+		  JSON_MAP(void *, unsigned int)::iterator it = json_global(MUTEX_MANAGER).find(mutex);
+		  if (it == json_global(MUTEX_MANAGER).end()){
+			 json_global(MUTEX_MANAGER).insert(std::pair<void *, unsigned int>(mutex, 1));
 		  } else {
 			 ++it -> second;
 		  }
@@ -149,12 +160,12 @@
 void internalJSONNode::_unset_mutex(void) json_nothrow {
     #ifdef JSON_MUTEX_MANAGE
 	   if (mylock != 0){
-		  std::map<void *, unsigned int>::iterator it = mutex_manager.find(mylock);
-		  JSON_ASSERT_SAFE(it != mutex_manager.end(), JSON_TEXT("Mutex not managed"), return;);
+		  JSON_MAP(void *, unsigned int)::iterator it = json_global(MUTEX_MANAGER).find(mylock);
+		  JSON_ASSERT_SAFE(it != json_global(MUTEX_MANAGER).end(), JSON_TEXT("Mutex not managed"), return;);
 		  --it -> second;
 		  if (it -> second == 0){
 			 JSON_ASSERT_SAFE(json_destroy, JSON_TEXT("You didn't register a destructor for mutexes"), return;);
-			 mutex_manager.erase(it);
+			 json_global(MUTEX_MANAGER).erase(it);
 		  }
 	   }
     #endif
@@ -168,8 +179,8 @@
 		  #ifdef JSON_MUTEX_MANAGE
 			 if (mylock != 0){
 				mut.push_back(JSON_NEW(JSONNode(JSON_TEXT("this"), (long)mylock)));
-				std::map<void *, unsigned int>::iterator it = mutex_manager.find(mylock);
-				if (it == mutex_manager.end()){
+				JSON_MAP(void *, unsigned int)::iterator it = json_global(MUTEX_MANAGER).find(mylock);
+				if (it == json_global(MUTEX_MANAGER).end()){
 				    mut.push_back(JSON_NEW(JSONNode(JSON_TEXT("references"), JSON_TEXT("error"))));
 				} else {
 				    mut.push_back(JSON_NEW(JSONNode(JSON_TEXT("references"), it -> second)));

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONPreparse.cpp Added

@@ -0,0 +1,499 @@
+/*
+ *  JSONPreparse.cpp
+ *  TestSuite
+ *
+ *  Created by Wallace on 4/13/11.
+ *  Copyright 2011 Streamwide. All rights reserved.
+ *
+ */
+
+#include "JSONPreparse.h"
+
+#if (defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY))
+
+#ifdef JSON_COMMENTS
+	json_string extractComment(json_string::const_iterator & ptr, json_string::const_iterator & end);
+	json_string extractComment(json_string::const_iterator & ptr, json_string::const_iterator & end){
+		json_string::const_iterator start;
+		json_string result;
+looplabel:
+		if (json_unlikely(((ptr != end) && (*ptr == JSON_TEMP_COMMENT_IDENTIFIER)))){
+			start = ++ptr;
+			for(; (ptr != end) && (*(ptr) != JSON_TEMP_COMMENT_IDENTIFIER); ++ptr){}
+			result += json_string(start, ptr);
+			if (json_unlikely(ptr == end)) return result;
+			++ptr;
+			if (json_unlikely(((ptr != end) && (*ptr == JSON_TEMP_COMMENT_IDENTIFIER)))){
+				result += JSON_TEXT('\n');
+				goto looplabel;
+			}
+		}
+		return result;
+	}
+	#define GET_COMMENT(x, y, name) json_string name = extractComment(x, y)
+	#define RETURN_NODE(node, name){\
+		JSONNode res = node;\
+		res.set_comment(name);\
+		return res;\
+	}
+	#define RETURN_NODE_NOCOPY(node, name){\
+		node.set_comment(name);\
+		return node;\
+	}
+	#define SET_COMMENT(node, name) node.set_comment(name)
+	#define COMMENT_ARG(name) ,name
+#else
+	#define GET_COMMENT(x, y, name) (void)0
+	#define RETURN_NODE(node, name) return node
+	#define RETURN_NODE_NOCOPY(node, name) return node
+	#define SET_COMMENT(node, name) (void)0
+	#define COMMENT_ARG(name)
+#endif
+
+inline bool isHex(json_char c) json_pure;
+inline bool isHex(json_char c) json_nothrow {
+    return (((c >= JSON_TEXT('0')) && (c <= JSON_TEXT('9'))) ||
+		  ((c >= JSON_TEXT('A')) && (c <= JSON_TEXT('F'))) ||
+		  ((c >= JSON_TEXT('a')) && (c <= JSON_TEXT('f'))));
+}
+
+#ifdef JSON_STRICT
+	#include "NumberToString.h"
+#endif
+
+json_number FetchNumber(const json_string & _string) json_nothrow;
+json_number FetchNumber(const json_string & _string) json_nothrow {
+    #ifdef JSON_STRICT
+	   return NumberToString::_atof(_string.c_str());
+    #else
+	   #ifdef JSON_UNICODE
+		  const size_t len = _string.length();
+		  #if defined(_MSC_VER) && defined(JSON_SAFE)
+			 const size_t bytes = (len * (sizeof(json_char) / sizeof(char))) + 1;
+			 json_auto<char> temp(bytes);
+			 size_t res;
+			 errno_t err = std::wcstombs_s(&res, temp.ptr, bytes, _string.c_str(), len);
+			 if (err != 0){
+				return (json_number)0.0;
+			 }
+		  #elif defined(JSON_SAFE)
+			 const size_t bytes = (len * (sizeof(json_char) / sizeof(char))) + 1;
+			 json_auto<char> temp(bytes);
+			 size_t res = std::wcstombs(temp.ptr, _string.c_str(), len);
+			 if (res == (size_t)-1){  //-1 is error code for this function
+				return (json_number)0.0;
+			 }
+		  #else
+			 json_auto<char> temp(len + 1);
+			 size_t res = std::wcstombs(temp.ptr, _string.c_str(), len);
+		  #endif
+		  temp.ptr[res] = JSON_TEXT('\0');
+		  return (json_number)std::atof(temp.ptr);
+	   #else
+		  return (json_number)std::atof(_string.c_str());
+	   #endif
+    #endif
+}
+
+JSONNode JSONPreparse::isValidNumber(json_string::const_iterator & ptr, json_string::const_iterator & end){
+    //ptr points at the first character in the number
+    //ptr will end up past the last character
+    json_string::const_iterator start = ptr;
+    bool decimal = false;
+    bool scientific = false;
+    
+    //first letter is weird
+    switch(*ptr){
+	   #ifndef JSON_STRICT
+	   case JSON_TEXT('.'):
+		  decimal = true;
+		  break;
+	   case JSON_TEXT('+'):
+	   #endif
+		  
+	   case JSON_TEXT('-'):
+	   case JSON_TEXT('1'):
+	   case JSON_TEXT('2'):
+	   case JSON_TEXT('3'):
+	   case JSON_TEXT('4'):
+	   case JSON_TEXT('5'):
+	   case JSON_TEXT('6'):
+	   case JSON_TEXT('7'):
+	   case JSON_TEXT('8'):
+	   case JSON_TEXT('9'):
+		  break;
+	   case JSON_TEXT('0'):
+		  ++ptr;
+		  switch(*ptr){
+			 case JSON_TEXT('.'):
+				decimal = true;
+				break;
+			 case JSON_TEXT('e'):
+			 case JSON_TEXT('E'):
+				scientific = true;
+				++ptr;
+				if (ptr == end) throw false;
+				switch(*ptr){
+				    case JSON_TEXT('-'):
+				    case JSON_TEXT('+'):
+				    case JSON_TEXT('0'):
+				    case JSON_TEXT('1'):
+				    case JSON_TEXT('2'):
+				    case JSON_TEXT('3'):
+				    case JSON_TEXT('4'):
+				    case JSON_TEXT('5'):
+				    case JSON_TEXT('6'):
+				    case JSON_TEXT('7'):
+				    case JSON_TEXT('8'):
+				    case JSON_TEXT('9'):
+					   break;
+				    default:
+					   throw false;
+				}
+				break;
+				
+			 #ifndef JSON_STRICT
+			 case JSON_TEXT('x'):
+				while(isHex(*++ptr)){};
+				return JSONNode(json_global(EMPTY_JSON_STRING), FetchNumber(json_string(start, end - 1)));
+			 #ifdef JSON_OCTAL
+			 #ifdef __GNUC__
+				case JSON_TEXT('0') ... JSON_TEXT('7'):  //octal
+			 #else
+				case JSON_TEXT('0'):
+				case JSON_TEXT('1'):
+				case JSON_TEXT('2'):
+				case JSON_TEXT('3'):
+				case JSON_TEXT('4'):
+				case JSON_TEXT('5'):
+				case JSON_TEXT('6'):
+				case JSON_TEXT('7'):
+			 #endif
+				while((*++ptr >= JSON_TEXT('0')) && (*ptr <= JSON_TEXT('7'))){};
+				if ((*ptr != JSON_TEXT('8')) && (*ptr != JSON_TEXT('9'))){
+				    return JSONNode(json_global(EMPTY_JSON_STRING), FetchNumber(json_string(start, ptr - 1)));
+				} 
+				throw false;
+			 case JSON_TEXT('8'):
+			 case JSON_TEXT('9'):
+				break;
+			 #else
+			 #ifdef __GNUC__
+				case JSON_TEXT('0') ... JSON_TEXT('9'):
+			 #else
+				case JSON_TEXT('0'):
+				case JSON_TEXT('1'):
+				case JSON_TEXT('2'):
+				case JSON_TEXT('3'):
+				case JSON_TEXT('4'):
+				case JSON_TEXT('5'):
+				case JSON_TEXT('6'):
+				case JSON_TEXT('7'):
+				case JSON_TEXT('8'):
+				case JSON_TEXT('9'):
+			 #endif
+				break;
+			 #endif
+			 #else
+			 #ifdef __GNUC__
+				case JSON_TEXT('0') ... JSON_TEXT('9'):
+			 #else
+				case JSON_TEXT('0'):
+				case JSON_TEXT('1'):
+				case JSON_TEXT('2'):
+				case JSON_TEXT('3'):
+				case JSON_TEXT('4'):
+				case JSON_TEXT('5'):
+				case JSON_TEXT('6'):
+				case JSON_TEXT('7'):
+				case JSON_TEXT('8'):
+				case JSON_TEXT('9'):
+			 #endif
+				break;
+			 #endif
+			 default:  //just a 0
+				return JSONNode(json_global(EMPTY_JSON_STRING), FetchNumber(json_string(start, ptr - 1)));;
+		  }
+		  break;
+	   default:
+		  throw false;
+    }
+    ++ptr;
+    
+    //next digits
+    while (true){
+	   switch(*ptr){
+		  case JSON_TEXT('.'):
+			 if (json_unlikely(decimal)) throw false; //multiple decimals
+			 if (json_unlikely(scientific)) throw false;
+			 decimal = true;
+			 break;
+		  case JSON_TEXT('e'):
+		  case JSON_TEXT('E'):
+			 if (json_likely(scientific)) throw false;
+			 scientific = true;
+			 ++ptr;
+			 switch(*ptr){
+				case JSON_TEXT('-'):
+				case JSON_TEXT('+'):
+				#ifdef __GNUC__
+				case JSON_TEXT('0') ... JSON_TEXT('9'):
+				#else
+				case JSON_TEXT('0'):
+				case JSON_TEXT('1'):
+				case JSON_TEXT('2'):
+				case JSON_TEXT('3'):
+				case JSON_TEXT('4'):
+				case JSON_TEXT('5'):
+				case JSON_TEXT('6'):
+				case JSON_TEXT('7'):
+				case JSON_TEXT('8'):
+				case JSON_TEXT('9'):
+				#endif
+				    break;
+				default:
+				    throw false;
+			 }
+			 break;
+		  #ifdef __GNUC__
+		  case JSON_TEXT('0') ... JSON_TEXT('9'):
+		  #else
+		  case JSON_TEXT('0'):
+		  case JSON_TEXT('1'):
+		  case JSON_TEXT('2'):
+		  case JSON_TEXT('3'):
+		  case JSON_TEXT('4'):
+		  case JSON_TEXT('5'):
+		  case JSON_TEXT('6'):
+		  case JSON_TEXT('7'):
+		  case JSON_TEXT('8'):
+		  case JSON_TEXT('9'):
+		  #endif
+			 break;
+		  default:
+			 return JSONNode(json_global(EMPTY_JSON_STRING), FetchNumber(json_string(start, ptr)));;
+	   }
+	   ++ptr;
+    }
+    throw false;
+}
+
+#ifndef JSON_STRICT
+    #define LETTERCASE(x, y)\
+	   case JSON_TEXT(x):\
+	   case JSON_TEXT(y)
+    #define LETTERCHECK(x, y)\
+	   if (json_unlikely((*++ptr != JSON_TEXT(x)) && (*ptr != JSON_TEXT(y)))) throw false
+#else
+    #define LETTERCASE(x, y)\
+	   case JSON_TEXT(x)
+    #define LETTERCHECK(x, y)\
+	   if (json_unlikely(*++ptr != JSON_TEXT(x))) throw false
+#endif
+JSONNode JSONPreparse::isValidMember(json_string::const_iterator & ptr, json_string::const_iterator & end){
+    //ptr is on the first character of the member
+    //ptr will end up immediately after the last character in the member
+    if (ptr == end) throw false;
+    
+    switch(*ptr){
+	   case JSON_TEXT('\"'):{
+           return JSONNode::stringType(isValidString(++ptr, end));
+	   }
+	   case JSON_TEXT('{'):
+		  return isValidObject(++ptr, end);
+	   case JSON_TEXT('['):
+		  return isValidArray(++ptr, end);
+	   LETTERCASE('t', 'T'):
+	   LETTERCHECK('r', 'R');
+	   LETTERCHECK('u', 'U');
+	   LETTERCHECK('e', 'E');
+		  ++ptr;
+		  return JSONNode(json_global(EMPTY_JSON_STRING), true);
+	   LETTERCASE('f', 'F'):
+	   LETTERCHECK('a', 'A');
+	   LETTERCHECK('l', 'L');
+	   LETTERCHECK('s', 'S');
+	   LETTERCHECK('e', 'E');
+		  ++ptr;
+		  return JSONNode(json_global(EMPTY_JSON_STRING), false);
+	   LETTERCASE('n', 'N'):
+	   LETTERCHECK('u', 'U');
+	   LETTERCHECK('l', 'L');
+	   LETTERCHECK('l', 'L');
+		  ++ptr;
+		  return JSONNode(JSON_NULL);
+	   #ifndef JSON_STRICT
+		  case JSON_TEXT('}'):  //null in libjson
+		  case JSON_TEXT(']'):  //null in libjson
+		  case JSON_TEXT(','):  //null in libjson
+			 return JSONNode(JSON_NULL);
+	   #endif
+    }
+    //a number
+    return isValidNumber(ptr, end);
+}
+
+json_string JSONPreparse::isValidString(json_string::const_iterator & ptr, json_string::const_iterator & end){
+    //ptr is pointing to the first character after the quote
+    //ptr will end up behind the closing "
+    json_string::const_iterator start = ptr;
+    
+    while(ptr != end){
+	   switch(*ptr){
+		  case JSON_TEXT('\\'):
+			 switch(*(++ptr)){
+				case JSON_TEXT('\"'):
+				case JSON_TEXT('\\'):
+				case JSON_TEXT('/'):
+				case JSON_TEXT('b'):
+				case JSON_TEXT('f'):
+				case JSON_TEXT('n'):
+				case JSON_TEXT('r'):
+				case JSON_TEXT('t'):
+				    break;
+				case JSON_TEXT('u'):
+				    if (json_unlikely(!isHex(*++ptr))) throw false;
+				    if (json_unlikely(!isHex(*++ptr))) throw false;
+				    //fallthrough to \x
+				#ifndef JSON_STRICT
+				    case JSON_TEXT('x'):  //hex
+				#endif
+				    if (json_unlikely(!isHex(*++ptr))) throw false;
+				    if (json_unlikely(!isHex(*++ptr))) throw false;
+				    break;
+				#ifndef JSON_OCTAL
+				    #ifdef __GNUC__
+					   case JSON_TEXT('0') ... JSON_TEXT('7'):  //octal
+				    #else
+					   case JSON_TEXT('0'):
+					   case JSON_TEXT('1'):
+					   case JSON_TEXT('2'):
+					   case JSON_TEXT('3'):
+					   case JSON_TEXT('4'):
+					   case JSON_TEXT('5'):
+					   case JSON_TEXT('6'):
+					   case JSON_TEXT('7'):
+				    #endif
+				    if (json_unlikely((*++ptr < JSON_TEXT('0')) || (*ptr > JSON_TEXT('7')))) throw false;
+				    if (json_unlikely((*++ptr < JSON_TEXT('0')) || (*ptr > JSON_TEXT('7')))) throw false;
+				    break;
+				#endif
+				default:
+				    throw false;
+			 }
+			 break;
+		  case JSON_TEXT('\"'):
+			 return json_string(start, ptr++);
+	   }
+	   ++ptr;
+    }
+    throw false;
+}
+
+void JSONPreparse::isValidNamedObject(json_string::const_iterator & ptr, json_string::const_iterator & end, JSONNode & parent COMMENT_PARAM(comment)) {
+	//ptr should be right before the string name
+    {
+	   json_string _name = isValidString(++ptr, end);
+	   if (json_unlikely(*ptr++ != JSON_TEXT(':'))) throw false;
+	   JSONNode res = isValidMember(ptr, end);
+	   res.set_name_(_name);
+		SET_COMMENT(res, comment);
+		#ifdef JSON_LIBRARY
+			parent.push_back(&res);
+		#else
+			parent.push_back(res);
+		#endif
+    }
+    if (ptr == end) throw false;
+    switch(*ptr){
+	   case JSON_TEXT(','):
+			++ptr;
+			{
+				GET_COMMENT(ptr, end, nextcomment);
+				isValidNamedObject(ptr, end, parent COMMENT_ARG(nextcomment));  //will handle all of them
+			}
+			return;
+	   case JSON_TEXT('}'):
+		  ++ptr;
+		  return;
+	   default:
+		  throw false;
+    }
+}
+
+JSONNode JSONPreparse::isValidObject(json_string::const_iterator & ptr, json_string::const_iterator & end) {
+    //ptr should currently be pointing past the {, so this must be the start of a name, or the closing }
+    //ptr will end up past the last }
+    JSONNode res(JSON_NODE);
+	GET_COMMENT(ptr, end, comment);
+	switch(*ptr){
+	  case JSON_TEXT('\"'):
+		 isValidNamedObject(ptr, end, res COMMENT_ARG(comment));
+		 return res;
+	  case JSON_TEXT('}'):
+		 ++ptr;
+		 return res;
+	  default:
+		 throw false;
+	}
+}
+
+void pushArrayMember(JSONNode & res, json_string::const_iterator & ptr, json_string::const_iterator & end);
+void pushArrayMember(JSONNode & res, json_string::const_iterator & ptr, json_string::const_iterator & end){
+	GET_COMMENT(ptr, end, comment);
+	JSONNode temp = JSONPreparse::isValidMember(ptr, end);
+	SET_COMMENT(temp, comment);
+	#ifdef JSON_LIBRARY
+		res.push_back(&temp);
+	#else
+		res.push_back(temp);
+	#endif
+}
+
+JSONNode JSONPreparse::isValidArray(json_string::const_iterator & ptr, json_string::const_iterator & end) {
+    //ptr should currently be pointing past the [, so this must be the start of a member, or the closing ]
+    //ptr will end up past the last ]
+    JSONNode res(JSON_ARRAY);
+    do{
+	   switch(*ptr){
+		  case JSON_TEXT(']'):
+			 ++ptr;
+			   return res;
+		  default:
+			 pushArrayMember(res, ptr, end);
+			 switch(*ptr){
+				case JSON_TEXT(','):
+				    break;
+				case JSON_TEXT(']'):
+				    ++ptr;
+					return res;
+				default:
+				    throw false;
+			 }
+			 break;
+	   }
+    } while (++ptr != end);
+    throw false;
+}
+
+JSONNode JSONPreparse::isValidRoot(const json_string & json) json_throws(std::invalid_argument) {
+    json_string::const_iterator it = json.begin();
+    json_string::const_iterator end = json.end();
+    try {
+		GET_COMMENT(it, end, comment);
+	   switch(*it){
+		  case JSON_TEXT('{'):
+			   RETURN_NODE(isValidObject(++it, end), comment);
+		   case JSON_TEXT('['):
+			   RETURN_NODE(isValidArray(++it, end), comment);
+	   }
+    } catch (...){}
+    
+    #ifndef JSON_NO_EXCEPTIONS
+	   throw std::invalid_argument(json_global(EMPTY_STD_STRING));
+    #else
+	   return JSONNode(JSON_NULL);
+    #endif
+}
+
+#endif

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONPreparse.h Added

@@ -0,0 +1,28 @@
+#ifndef LIBJSON_GUARD_PREPARSE_H
+#define LIBJSON_GUARD_PREPARSE_H
+
+#include "JSONDebug.h"
+#include "JSONNode.h"
+
+#if (defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY))
+
+#ifdef JSON_COMMENTS
+	#define COMMENT_PARAM(name) ,const json_string & name
+#else
+	#define COMMENT_PARAM(name)
+#endif
+
+class JSONPreparse {
+public:
+    static JSONNode isValidNumber(json_string::const_iterator & ptr, json_string::const_iterator & end) json_read_priority;
+    static JSONNode isValidMember(json_string::const_iterator & ptr, json_string::const_iterator & end) json_read_priority;
+    static json_string isValidString(json_string::const_iterator & ptr, json_string::const_iterator & end) json_read_priority;
+    static void isValidNamedObject(json_string::const_iterator & ptr, json_string::const_iterator & end, JSONNode & parent COMMENT_PARAM(comment)) json_read_priority;
+    static JSONNode isValidObject(json_string::const_iterator & ptr, json_string::const_iterator & end) json_read_priority;
+    static JSONNode isValidArray(json_string::const_iterator & ptr, json_string::const_iterator & end) json_read_priority;
+    static JSONNode isValidRoot(const json_string & json) json_throws(std::invalid_argument) json_read_priority;
+};
+
+#endif
+
+#endif

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONSharedString.h Added

@@ -0,0 +1,308 @@
+#ifndef JSON_SHARED_STRING_H
+#define JSON_SHARED_STRING_H
+
+/*
+ *	This class allows json objects to share string
+ *	Since libjson is a parser, it does a lot of substrings, but since
+ *	a string with all of the information already exists, those substrings
+ *	can be infered by an offset and length and a pointer to the master
+ *	string
+ *
+ *	EXPERIMENTAL, Not used yet
+ */
+
+#include "JSONDebug.h"
+#include "JSONGlobals.h"
+#include "JSONMemory.h"
+
+/*
+mallocs: 3351
+frees: 3351
+reallocs: 3
+bytes: 298751 (291 KB)
+max bytes at once: 3624 (3 KB)
+avg bytes at once: 970 (0 KB)
+*/
+
+#ifdef JSON_LESS_MEMORY
+	#ifdef __GNUC__
+		#pragma pack(push, 1)
+	#elif _MSC_VER
+		#pragma pack(push, json_shared_string_pack, 1)
+	#endif
+#endif
+
+class json_shared_string {
+public:
+
+
+	struct iterator;
+	  struct const_iterator {
+		const_iterator(const json_char * p, const json_shared_string * pa) : parent(pa), it(p){}
+	  
+		 inline const_iterator& operator ++(void) json_nothrow { ++it; return *this; }
+		 inline const_iterator& operator --(void) json_nothrow { --it; return *this; }
+		 inline const_iterator& operator +=(long i) json_nothrow { it += i; return *this; }
+		 inline const_iterator& operator -=(long i) json_nothrow { it -= i; return *this; }
+		 inline const_iterator operator ++(int) json_nothrow {
+			const_iterator result(*this);
+			++it;
+			return result;
+		 }
+		 inline const_iterator operator --(int) json_nothrow {
+			const_iterator result(*this);
+			--it;
+			return result;
+		 }
+		 inline const_iterator operator +(long i) const json_nothrow {
+			const_iterator result(*this);
+			result.it += i;
+			return result;
+		 }
+		 inline const_iterator operator -(long i) const json_nothrow {
+			const_iterator result(*this);
+			result.it -= i;
+			return result;
+		 }
+		 inline const json_char & operator [](size_t pos) const json_nothrow { return it[pos]; };
+		 inline const json_char & operator *(void) const json_nothrow { return *it; }
+		 inline const json_char * operator ->(void) const json_nothrow { return it; }
+		 inline bool operator == (const const_iterator & other) const json_nothrow { return it == other.it; }
+		 inline bool operator != (const const_iterator & other) const json_nothrow { return it != other.it; }
+		 inline bool operator > (const const_iterator & other) const json_nothrow { return it > other.it; }
+		 inline bool operator >= (const const_iterator & other) const json_nothrow { return it >= other.it; }
+		 inline bool operator < (const const_iterator & other) const json_nothrow { return it < other.it; }
+		 inline bool operator <= (const const_iterator & other) const json_nothrow { return it <= other.it; }
+
+		 inline bool operator == (const iterator & other) const json_nothrow { return it == other.it; }
+		 inline bool operator != (const iterator & other) const json_nothrow { return it != other.it; }
+		 inline bool operator > (const iterator & other) const json_nothrow { return it > other.it; }
+		 inline bool operator >= (const iterator & other) const json_nothrow { return it >= other.it; }
+		 inline bool operator < (const iterator & other) const json_nothrow { return it < other.it; }
+		 inline bool operator <= (const iterator & other) const json_nothrow { return it <= other.it; }
+
+		 inline const_iterator & operator =(const const_iterator & orig) json_nothrow { it = orig.it; return *this; }
+		 const_iterator (const const_iterator & orig) json_nothrow : it(orig.it) {}
+	  private:
+		 const json_shared_string * parent;
+		 const json_char * it;
+		 friend class json_shared_string;
+		 friend struct iterator;
+	  };
+	  
+	  struct iterator {
+		iterator(const json_char * p, const json_shared_string * pa) : parent(pa), it(p){}
+	  
+		 inline iterator& operator ++(void) json_nothrow { ++it; return *this; }
+		 inline iterator& operator --(void) json_nothrow { --it; return *this; }
+		 inline iterator& operator +=(long i) json_nothrow { it += i; return *this; }
+		 inline iterator& operator -=(long i) json_nothrow { it -= i; return *this; }
+		 inline iterator operator ++(int) json_nothrow {
+			iterator result(*this);
+			++it;
+			return result;
+		 }
+		 inline iterator operator --(int) json_nothrow {
+			iterator result(*this);
+			--it;
+			return result;
+		 }
+		 inline iterator operator +(long i) const json_nothrow {
+			iterator result(*this);
+			result.it += i;
+			return result;
+		 }
+		 inline iterator operator -(long i) const json_nothrow {
+			iterator result(*this);
+			result.it -= i;
+			return result;
+		 }
+		 inline const json_char & operator [](size_t pos) const json_nothrow { return it[pos]; };
+		 inline const json_char & operator *(void) const json_nothrow { return *it; }
+		 inline const json_char * operator ->(void) const json_nothrow { return it; }
+		 inline bool operator == (const const_iterator & other) const json_nothrow { return it == other.it; }
+		 inline bool operator != (const const_iterator & other) const json_nothrow { return it != other.it; }
+		 inline bool operator > (const const_iterator & other) const json_nothrow { return it > other.it; }
+		 inline bool operator >= (const const_iterator & other) const json_nothrow { return it >= other.it; }
+		 inline bool operator < (const const_iterator & other) const json_nothrow { return it < other.it; }
+		 inline bool operator <= (const const_iterator & other) const json_nothrow { return it <= other.it; }
+
+		 inline bool operator == (const iterator & other) const json_nothrow { return it == other.it; }
+		 inline bool operator != (const iterator & other) const json_nothrow { return it != other.it; }
+		 inline bool operator > (const iterator & other) const json_nothrow { return it > other.it; }
+		 inline bool operator >= (const iterator & other) const json_nothrow { return it >= other.it; }
+		 inline bool operator < (const iterator & other) const json_nothrow { return it < other.it; }
+		 inline bool operator <= (const iterator & other) const json_nothrow { return it <= other.it; }
+
+		 inline iterator & operator =(const iterator & orig) json_nothrow { it = orig.it; return *this; }
+		 iterator (const iterator & orig) json_nothrow : it(orig.it) {}
+	  private:
+		 const json_shared_string * parent;
+		 const json_char * it;
+		 friend class json_shared_string;
+		 friend struct const_iterator;
+	  };
+
+
+
+	inline json_shared_string::iterator begin(void){
+		iterator res = iterator(data(), this); 
+		return res;
+	}
+	inline json_shared_string::iterator end(void){
+		iterator res = iterator(data() + len, this); 
+		return res;
+	}
+	inline json_shared_string::const_iterator begin(void) const {
+		const_iterator res = const_iterator(data(), this); 
+		return res;
+	}
+	inline json_shared_string::const_iterator end(void) const {
+		const_iterator res = const_iterator(data() + len, this); 
+		return res;
+	}
+	
+
+	inline json_string::iterator std_begin(void){
+		return _str -> mystring.begin() + offset;
+	}
+	inline json_string::iterator std_end(void){
+		return std_begin() + len;
+	}
+	
+	inline json_string::const_iterator std_begin(void) const{
+		return _str -> mystring.begin() + offset;
+	}
+	inline json_string::const_iterator std_end(void) const{
+		return std_begin() + len;
+	}
+	
+	inline json_shared_string(void) : offset(0), len(0), _str(new(json_malloc<json_shared_string_internal>(1)) json_shared_string_internal(json_global(EMPTY_JSON_STRING))) {}
+	
+	inline json_shared_string(const json_string & str) : offset(0), len(str.length()), _str(new(json_malloc<json_shared_string_internal>(1)) json_shared_string_internal(str)) {}
+	
+	inline json_shared_string(const json_shared_string & str, size_t _offset, size_t _len) : _str(str._str), offset(str.offset + _offset), len(_len) {
+		++_str -> refCount;
+	}
+	
+	inline json_shared_string(const json_shared_string & str, size_t _offset) : _str(str._str), offset(str.offset + _offset), len(str.len - _offset) {
+		++_str -> refCount;
+	}
+	
+	inline json_shared_string(const iterator & s, const iterator & e) : _str(s.parent -> _str), offset(s.it - s.parent -> _str -> mystring.data()), len(e.it - s.it){
+		++_str -> refCount;
+	}
+	
+	inline ~json_shared_string(void){
+		deref();
+	}
+	
+	inline bool empty(void) const { return len == 0; }
+	
+	size_t find(json_char ch, size_t pos = 0) const {
+		if (_str -> refCount == 1) return _str -> mystring.find(ch, pos);
+		json_string::const_iterator e = std_end();
+		for(json_string::const_iterator b = std_begin() + pos; b != e; ++b){
+			if (*b == ch) return b - std_begin();
+		}
+		return json_string::npos;
+	}
+	
+	inline json_char & operator[] (size_t loc){
+		return _str -> mystring[loc + offset];
+	}
+	inline json_char operator[] (size_t loc) const {
+		return _str -> mystring[loc + offset];
+	}
+	inline void clear(){ len = 0; }
+	inline size_t length() const { return len; }
+	inline const json_char * c_str() const { return toString().c_str(); }
+	inline const json_char * data() const { return _str -> mystring.data() + offset; }
+	
+	inline bool operator != (const json_shared_string & other) const {
+		if ((other._str == _str) && (other.len == len) && (other.offset == offset)) return false;
+		return other.toString() != toString();
+	}
+	
+	inline bool operator == (const json_shared_string & other) const {
+		if ((other._str == _str) && (other.len == len) && (other.offset == offset)) return true;
+		return other.toString() == toString();
+	}
+	
+	inline bool operator == (const json_string & other) const {
+		return other == toString();
+	}
+	
+	json_string & toString(void) const {
+		//gonna have to do a real substring now anyway, so do it completely
+		if (_str -> refCount == 1){
+			if (offset || len != _str -> mystring.length()){
+				_str -> mystring = json_string(std_begin(), std_end());
+			}
+		} else if (offset || len != _str -> mystring.length()){
+			--_str -> refCount;  //dont use deref because I know its not going to be deleted
+			_str = new(json_malloc<json_shared_string_internal>(1)) json_shared_string_internal(json_string(std_begin(), std_end()));
+		}
+		offset = 0;
+		return _str -> mystring;
+	}
+	
+	
+	inline void assign(const json_shared_string & other, size_t _offset, size_t _len){
+		if (other._str != _str){
+			deref();
+			_str = other._str;
+		}
+		++_str -> refCount;
+		offset = other.offset + _offset;
+		len = _len;
+	}
+	
+	json_shared_string(const json_shared_string & other) : _str(other._str), offset(other.offset), len(other.len){
+		++_str -> refCount;
+	}
+	
+	json_shared_string & operator =(const json_shared_string & other){
+		if (other._str != _str){
+			deref();
+			_str = other._str;
+			++_str -> refCount;
+		}
+		offset = other.offset;
+		len = other.len;
+		return *this;
+	}
+	
+	json_shared_string & operator += (const json_char c){
+		toString() += c;
+		++len;
+		return *this;
+	}
+	
+	//when doing a plus equal of another string, see if it shares the string and starts where this one left off, in which case just increase len
+JSON_PRIVATE
+	struct json_shared_string_internal {
+		inline json_shared_string_internal(const json_string & _mystring) : mystring(_mystring), refCount(1) {}
+		json_string mystring;
+		size_t refCount PACKED(20);
+	};
+	inline void deref(void){
+		if (--_str -> refCount == 0){
+			_str -> ~json_shared_string_internal();
+			libjson_free<json_shared_string_internal>(_str);
+		}
+	}
+	mutable json_shared_string_internal * _str;
+	mutable size_t offset PACKED(20);
+	mutable size_t len PACKED(20);
+};
+
+#ifdef JSON_LESS_MEMORY
+	#ifdef __GNUC__
+		#pragma pack(pop)
+	#elif _MSC_VER
+		#pragma pack(pop, json_shared_string_pack,)
+	#endif
+#endif
+
+#endif

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONSingleton.h Added

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONStats.h Added

@@ -0,0 +1,83 @@
+#ifndef TestSuite_JSONStats_h
+#define TestSuite_JSONStats_h
+
+#include "../JSONOptions.h"
+
+#if defined(JSON_UNIT_TEST) || defined(JSON_DEBUG)
+	#define LIBJSON_OBJECT(name)\
+		static size_t & getCtorCounter(void){\
+			static size_t count = 0;\
+			static int i = JSONStats::setCallbacks(getCtorCounter, getCopyCtorCounter, getAssignmentCounter, getDtorCounter, #name);\
+			return count;\
+		}\
+		static size_t & getCopyCtorCounter(void){\
+			static size_t count = 0;\
+			static int i = JSONStats::setCallbacks(getCtorCounter, getCopyCtorCounter, getAssignmentCounter, getDtorCounter, #name);\
+			return count;\
+		}\
+		static size_t & getAssignmentCounter(void){\
+			static size_t count = 0;\
+			static int i = JSONStats::setCallbacks(getCtorCounter, getCopyCtorCounter, getAssignmentCounter, getDtorCounter, #name);\
+			return count;\
+		}\
+		static size_t & getDtorCounter(void){\
+			static size_t count = 0;\
+			static int i = JSONStats::setCallbacks(getCtorCounter, getCopyCtorCounter, getAssignmentCounter, getDtorCounter, #name);\
+			return count;\
+		}
+	#define LIBJSON_CTOR getCtorCounter() += 1
+	#define LIBJSON_COPY_CTOR getCopyCtorCounter() += 1
+	#define LIBJSON_ASSIGNMENT getAssignmentCounter() += 1
+	#define LIBJSON_DTOR getDtorCounter() += 1
+	
+	#include <map>
+	#include <sstream>
+	#include <iostream>
+	#include <string>
+	class JSONStats {
+	public:
+		~JSONStats(void){ 
+			std::map<getCounter_m, objectStructure*> & mymap = getMapper();
+			std::map<getCounter_m, objectStructure*>::iterator b = mymap.begin();
+			std::map<getCounter_m, objectStructure*>::iterator e = mymap.end();
+			std::cout << "Counters for libjson:" << std::endl;
+			for(; b != e; ++b){
+				std::cout << "  " << b -> second -> _name << std::endl;
+				std::cout << "     Constructor:      " << b -> second -> _cTor() << std::endl;
+				std::cout << "     Copy Constructor: " << b -> second -> _ccTor() << std::endl;
+				std::cout << "     Assignment:       " << b -> second -> _assign() << std::endl;
+				std::cout << "     Destructor:       " << b -> second -> _dTor() << std::endl;
+				delete b -> second;
+			}
+		}
+		
+		typedef size_t & (*getCounter_m)(void);
+		struct objectStructure {
+			objectStructure(getCounter_m cTor, getCounter_m ccTor, getCounter_m assign, getCounter_m dTor, const std::string & name):
+				_cTor(cTor), _ccTor(ccTor), _assign(assign), _dTor(dTor), _name(name){}
+			std::string _name;
+			getCounter_m _cTor;
+			getCounter_m _ccTor;
+			getCounter_m _assign;
+			getCounter_m _dTor;
+		};
+		static int setCallbacks(getCounter_m cTor, getCounter_m ccTor, getCounter_m assign, getCounter_m dtor, const std::string & name){
+			getMapper()[cTor] = new objectStructure (cTor, ccTor, assign, dtor, name);
+			return 0;
+		}
+		
+		static std::map<getCounter_m, objectStructure*> & getMapper(void) {
+			static std::map<getCounter_m, objectStructure*> mymap;
+			return mymap;
+		}
+	};
+#else
+	#define LIBJSON_OBJECT(name)
+	#define LIBJSON_CTOR (void)0
+	#define LIBJSON_DTOR (void)0
+	#define LIBJSON_COPY_CTOR (void)0
+	#define LIBJSON_ASSIGNMENT (void)0
+	typedef int JSONStats;
+#endif
+
+#endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONStream.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONStream.cpp Changed

@@ -2,15 +2,24 @@
 
 #ifdef JSON_STREAM
 #include "JSONWorker.h"
+#include "JSONValidator.h"
 
 
-JSONStream::JSONStream(json_stream_callback_t call_p) json_nothrow : call(call_p), buffer() {}
+JSONStream::JSONStream(json_stream_callback_t call_p, json_stream_e_callback_t call_e, void * callbackIdentifier) json_nothrow : state(true), call(call_p), err_call(call_e), buffer(), callback_identifier(callbackIdentifier) {
+	LIBJSON_CTOR;
+}
 
-JSONStream::JSONStream(const JSONStream & orig) json_nothrow : call(orig.call), buffer(orig.buffer){}
+JSONStream::JSONStream(const JSONStream & orig) json_nothrow : state(orig.state), call(orig.call), err_call(orig.err_call), buffer(orig.buffer), callback_identifier(orig.callback_identifier){
+	LIBJSON_COPY_CTOR;
+}
 
 JSONStream & JSONStream::operator =(const JSONStream & orig) json_nothrow {
+	LIBJSON_ASSIGNMENT;
+	err_call = orig.err_call;
     call = orig.call;
+	state = orig.state;
     buffer = orig.buffer;
+	callback_identifier = orig.callback_identifier;
     return *this;
 }
 
@@ -19,9 +28,11 @@
 #else
     JSONStream & JSONStream::operator << (const json_string & str) json_nothrow {
 #endif
-    buffer += str;
-    parse();
-    return *this;
+		if (state){
+			buffer += str;
+			parse();
+		}
+		return *this;
 }
 
 
@@ -57,7 +68,14 @@
     case right:\
 	   return json_string::npos;
 
-size_t JSONStream::FindNextRelevant(json_char ch, const json_string & value_t, const size_t pos) json_nothrow {
+#if (JSON_READ_PRIORITY == HIGH) && (!(defined(JSON_LESS_MEMORY)))
+	#define STREAM_FIND_NEXT_RELEVANT(ch, vt, po) FindNextRelevant<ch>(vt, po)
+	template<json_char ch>
+	size_t JSONStream::FindNextRelevant(const json_string & value_t, const size_t pos) json_nothrow {
+#else
+	#define STREAM_FIND_NEXT_RELEVANT(ch, vt, po) FindNextRelevant(ch, vt, po)
+	size_t JSONStream::FindNextRelevant(json_char ch, const json_string & value_t, const size_t pos) json_nothrow {
+#endif
     const json_char * start = value_t.c_str();
     for (const json_char * p = start + pos; *p; ++p){
 	   if (json_unlikely(*p == ch)) return p - start;
@@ -71,23 +89,55 @@
 }
 
 void JSONStream::parse(void) json_nothrow {
-    size_t pos = buffer.find_first_of(JSON_TEXT("{["));
-    if (json_likely(pos != json_string::npos)){
-	   size_t end = (buffer[pos] == JSON_TEXT('[')) ? FindNextRelevant(JSON_TEXT(']'), buffer, pos + 1) : FindNextRelevant(JSON_TEXT('}'), buffer, pos + 1);
-	   if (end != json_string::npos){
-		  START_MEM_SCOPE
-			 JSONNode temp(JSONWorker::parse(buffer.substr(pos, end - pos + 1)));
-			 #ifndef JSON_LIBRARY
-				call(temp);
-			 #else
-				call(&temp);
-			 #endif
-		  END_MEM_SCOPE
-		  json_string::iterator beginning = buffer.begin();
-		  buffer.erase(beginning, beginning + end);
-		  parse();
-	   }
-    }
+	#ifdef JSON_SECURITY_MAX_STREAM_OBJECTS
+		size_t objects = 0;
+	#endif
+	for(;;){
+		size_t pos = buffer.find_first_of(JSON_TEXT("{["));
+		if (json_likely(pos != json_string::npos)){
+		   size_t end = (buffer[pos] == JSON_TEXT('[')) ? STREAM_FIND_NEXT_RELEVANT(JSON_TEXT(']'), buffer, pos + 1) : STREAM_FIND_NEXT_RELEVANT(JSON_TEXT('}'), buffer, pos + 1);
+		   if (end != json_string::npos){
+			  #ifdef JSON_SECURITY_MAX_STREAM_OBJECTS
+			     if (++objects > JSON_SECURITY_MAX_STREAM_OBJECTS){
+				     JSON_FAIL(JSON_TEXT("Maximum number of json objects for a stream at once has been reached"));
+					 if (err_call) err_call(getIdentifier());
+					 state = false;
+				     return;
+			     }
+			  #endif
+			  START_MEM_SCOPE
+				 JSONNode temp(JSONWorker::parse(buffer.substr(pos, end - pos + 1)));
+				 #ifndef JSON_LIBRARY
+					call(temp, getIdentifier());
+				 #else
+					call(&temp, getIdentifier());
+				 #endif
+			  END_MEM_SCOPE
+			  json_string::iterator beginning = buffer.begin();
+			  buffer.erase(beginning, beginning + end);
+			  continue; //parse();  //parse the next object too
+		   }
+		   #ifdef JSON_SAFE
+				else {
+					//verify that what's in there is at least valid so far
+					#ifndef JSON_VALIDATE
+						#error In order to use safe mode and streams, JSON_VALIDATE needs to be defined			
+					#endif
+					
+					json_auto<json_char> s;
+					size_t len;
+					s.set(JSONWorker::RemoveWhiteSpace(json_string(buffer.c_str() + pos), len, false));
+					
+					
+					if (!JSONValidator::isValidPartialRoot(s.ptr)){
+						if (err_call) err_call(getIdentifier());
+						state = false;
+					}
+				}
+		   #endif
+		}
+		break;
+	}
 }
 
 #endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONStream.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONStream.h Changed

@@ -1,53 +1,92 @@
-#ifndef JSONSTREAM_H
-#define JSONSTREAM_H
+#ifndef LIBJSON_GUARD_STREAM_H
+#define LIBJSON_GUARD_STREAM_H
 
 #include "JSONDebug.h"
 
 #ifdef JSON_STREAM
 
+#ifdef JSON_LESS_MEMORY
+	#ifdef __GNUC__
+		#pragma pack(push, 1)
+	#elif _MSC_VER
+		#pragma pack(push, JSONStream_pack, 1)
+	#endif
+#endif
+
 #ifdef JSON_MEMORY_CALLBACKS
-    #include "JSONMemory.h"
+#include "JSONMemory.h"
 #endif
 
 #ifndef JSON_LIBRARY
-    class JSONNode; //foreward declaration
-    typedef void (*json_stream_callback_t)(JSONNode &);
+class JSONNode; //foreward declaration
+typedef void (*json_stream_callback_t)(JSONNode &, void *);
 #endif
 
 class JSONStream {
 public:
-    JSONStream(json_stream_callback_t call_p) json_nothrow;
+	LIBJSON_OBJECT(JSONStream);
+    JSONStream(json_stream_callback_t call_p, json_stream_e_callback_t call_e = NULL, void * callbackIdentifier = JSONSTREAM_SELF) json_nothrow;
     JSONStream(const JSONStream & orig) json_nothrow;
     JSONStream & operator =(const JSONStream & orig) json_nothrow;
-    #ifdef JSON_LIBRARY
-	   JSONStream & operator << (const json_char * str) json_nothrow;
-    #else
-	   JSONStream & operator << (const json_string & str) json_nothrow;
-    #endif
-
+	~JSONStream(void) json_nothrow { LIBJSON_DTOR; }
+#ifdef JSON_LIBRARY
+	JSONStream & operator << (const json_char * str) json_nothrow;
+#else
+	JSONStream & operator << (const json_string & str) json_nothrow;
+#endif
+	
     static void deleteJSONStream(JSONStream * stream) json_nothrow {
-	   #ifdef JSON_MEMORY_CALLBACKS
-		  stream -> ~JSONStream();
-		  libjson_free<JSONStream>(stream);
-	   #else
-		  delete stream;
-	   #endif
+#ifdef JSON_MEMORY_CALLBACKS
+		stream -> ~JSONStream();
+		libjson_free<JSONStream>(stream);
+#else
+		delete stream;
+#endif
     }
-
-    static JSONStream * newJSONStream(json_stream_callback_t callback) json_nothrow {
-	   #ifdef JSON_MEMORY_CALLBACKS
-		  return new(json_malloc<JSONStream>(1)) JSONStream(callback);
-	   #else
-		  return new JSONStream(callback);
-	   #endif
+	
+    static JSONStream * newJSONStream(json_stream_callback_t callback, json_stream_e_callback_t call_e, void * callbackIdentifier) json_nothrow {
+#ifdef JSON_MEMORY_CALLBACKS
+		return new(json_malloc<JSONStream>(1)) JSONStream(callback, call_e, callbackIdentifier);
+#else
+		return new JSONStream(callback, call_e, callbackIdentifier);
+#endif
     }
+	
+	inline void reset() json_nothrow {
+		state = true;
+		buffer.clear();
+	}
 JSON_PRIVATE
-    size_t FindNextRelevant(json_char ch, const json_string & value_t, const size_t pos) json_nothrow;
+	inline void * getIdentifier(void) json_nothrow {
+		if (callback_identifier == JSONSTREAM_SELF){
+			return (void*)this;
+		}
+		return callback_identifier;
+	}
+	
+	#if (JSON_READ_PRIORITY == HIGH) && (!(defined(JSON_LESS_MEMORY)))
+		template<json_char ch>
+		static size_t FindNextRelevant(const json_string & value_t, const size_t pos) json_nothrow json_read_priority;
+	#else
+		static size_t FindNextRelevant(json_char ch, const json_string & value_t, const size_t pos) json_nothrow json_read_priority;
+	#endif
+	
     void parse(void) json_nothrow;
     json_string buffer;
     json_stream_callback_t call;
+	json_stream_e_callback_t err_call;
+	void * callback_identifier;
+	bool state BITS(1);
 };
 
+#ifdef JSON_LESS_MEMORY
+	#ifdef __GNUC__
+		#pragma pack(pop)
+	#elif _MSC_VER
+		#pragma pack(pop, JSONStream_pack)
+	#endif
+#endif
+
 #endif
 
 #endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONValidator.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONValidator.cpp Changed

@@ -24,6 +24,16 @@
 		  case JSON_TEXT('+'):
 	   #endif
 	   case JSON_TEXT('-'):
+		#ifdef JSON_STRICT
+			switch(*(ptr + 1)){
+				case '.':
+				case 'e':
+				case 'E':
+				case '\0':
+					return false;
+			}
+			break;
+		#endif
 	   case JSON_TEXT('1'):
 	   case JSON_TEXT('2'):
 	   case JSON_TEXT('3'):
@@ -199,16 +209,18 @@
     #define LETTERCHECK(x, y)\
 	   if (json_unlikely(*++ptr != JSON_TEXT(x))) return false
 #endif
-bool JSONValidator::isValidMember(const json_char * & ptr) json_nothrow {
+bool JSONValidator::isValidMember(const json_char * & ptr  DEPTH_PARAM) json_nothrow {
     //ptr is on the first character of the member
     //ptr will end up immediately after the last character in the member
     switch(*ptr){
 	   case JSON_TEXT('\"'):
 		  return isValidString(++ptr);
 	   case JSON_TEXT('{'):
-		  return isValidObject(++ptr);
+		  INC_DEPTH();
+		  return isValidObject(++ptr  DEPTH_ARG(depth_param));
 	   case JSON_TEXT('['):
-		  return isValidArray(++ptr);
+		  INC_DEPTH();
+		  return isValidArray(++ptr  DEPTH_ARG(depth_param));
 	   LETTERCASE('t', 'T'):
 		  LETTERCHECK('r', 'R');
 		  LETTERCHECK('u', 'U');
@@ -267,7 +279,7 @@
 				    if (json_unlikely(!isHex(*++ptr))) return false;
 				    if (json_unlikely(!isHex(*++ptr))) return false;
 				    break;
-				#ifndef JSON_OCTAL
+				#ifdef JSON_OCTAL
 				    #ifdef __GNUC__
 				    case JSON_TEXT('0') ... JSON_TEXT('7'):  //octal
 				    #else
@@ -299,13 +311,13 @@
     return false;
 }
 
-bool JSONValidator::isValidNamedObject(const json_char * &ptr) json_nothrow {
+bool JSONValidator::isValidNamedObject(const json_char * &ptr  DEPTH_PARAM) json_nothrow {
     if (json_unlikely(!isValidString(++ptr))) return false;
-    if (json_unlikely(*ptr++ != ':')) return false;
-    if (json_unlikely(!isValidMember(ptr))) return false;
+    if (json_unlikely(*ptr++ != JSON_TEXT(':'))) return false;
+    if (json_unlikely(!isValidMember(ptr  DEPTH_ARG(depth_param)))) return false;
     switch(*ptr){
 	   case JSON_TEXT(','):
-		  return isValidNamedObject(++ptr);
+		  return isValidNamedObject(++ptr  DEPTH_ARG(depth_param));
 	   case JSON_TEXT('}'):
 		  ++ptr;
 		  return true;
@@ -314,13 +326,13 @@
     }
 }
 
-bool JSONValidator::isValidObject(const json_char * & ptr) json_nothrow {
+bool JSONValidator::isValidObject(const json_char * & ptr  DEPTH_PARAM) json_nothrow {
     //ptr should currently be pointing past the {, so this must be the start of a name, or the closing }
     //ptr will end up past the last }
     do{
 	   switch(*ptr){
 		  case JSON_TEXT('\"'):
-			 return isValidNamedObject(ptr);
+			 return isValidNamedObject(ptr  DEPTH_ARG(depth_param));
 		  case JSON_TEXT('}'):
 			 ++ptr;
 			 return true;
@@ -331,7 +343,7 @@
     return false;
 }
 
-bool JSONValidator::isValidArray(const json_char * & ptr) json_nothrow {
+bool JSONValidator::isValidArray(const json_char * & ptr  DEPTH_PARAM) json_nothrow {
     //ptr should currently be pointing past the [, so this must be the start of a member, or the closing ]
     //ptr will end up past the last ]
     do{
@@ -340,7 +352,7 @@
 			 ++ptr;
 			 return true;
 		  default:
-			 if (json_unlikely(!isValidMember(ptr))) return false;
+			 if (json_unlikely(!isValidMember(ptr  DEPTH_ARG(depth_param)))) return false;
 			 switch(*ptr){
 				case JSON_TEXT(','):
 				    break;
@@ -360,12 +372,12 @@
     const json_char * ptr = json;
     switch(*ptr){
 	   case JSON_TEXT('{'):
-		  if (json_likely(isValidObject(++ptr))){
+		  if (json_likely(isValidObject(++ptr  DEPTH_ARG(1)))){
 			 return *ptr == JSON_TEXT('\0');
 		  }
 		  return false;
 	   case JSON_TEXT('['):
-		  if (json_likely(isValidArray(++ptr))){
+		  if (json_likely(isValidArray(++ptr  DEPTH_ARG(1)))){
 			 return *ptr == JSON_TEXT('\0');
 		  }
 		  return false;
@@ -373,4 +385,20 @@
     return false;
 }
 
+#ifdef JSON_STREAM
+//It has already been checked for a complete structure, so we know it's not complete
+bool JSONValidator::isValidPartialRoot(const json_char * json) json_nothrow {
+	const json_char * ptr = json;
+    switch(*ptr){
+		case JSON_TEXT('{'):
+			JSON_ASSERT_SAFE(!isValidObject(++ptr  DEPTH_ARG(1)), JSON_TEXT("Partial Object seems to be valid"), );
+			return *ptr == JSON_TEXT('\0');
+		case JSON_TEXT('['):
+			JSON_ASSERT_SAFE(!isValidArray(++ptr  DEPTH_ARG(1)), JSON_TEXT("Partial Object seems to be valid"), );
+			return *ptr == JSON_TEXT('\0');
+    }
+    return false;
+}
+#endif
+
 #endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONValidator.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONValidator.h Changed

@@ -5,15 +5,34 @@
 
 #ifdef JSON_VALIDATE
 
+#ifdef JSON_SECURITY_MAX_NEST_LEVEL
+    #define DEPTH_PARAM ,size_t depth_param
+    #define DEPTH_ARG(arg) ,arg
+    #define INC_DEPTH()\
+    if (++depth_param > JSON_SECURITY_MAX_NEST_LEVEL){\
+	   JSON_FAIL(JSON_TEXT("Exceeded JSON_SECURITY_MAX_NEST_LEVEL"));\
+	   return false;\
+    }
+#else
+    #define DEPTH_PARAM
+    #define DEPTH_ARG(arg)
+    #define INC_DEPTH() (void)0
+#endif
+
 class JSONValidator {
     public:
 	   static bool isValidNumber(const json_char * & ptr) json_nothrow json_read_priority;
-	   static bool isValidMember(const json_char * & ptr) json_nothrow json_read_priority;
+	   static bool isValidMember(const json_char * & ptr  DEPTH_PARAM) json_nothrow json_read_priority;
 	   static bool isValidString(const json_char * & ptr) json_nothrow json_read_priority;
-	   static bool isValidNamedObject(const json_char * & ptr) json_nothrow json_read_priority;
-	   static bool isValidObject(const json_char * & ptr) json_nothrow json_read_priority;
-	   static bool isValidArray(const json_char * & ptr) json_nothrow json_read_priority;
+	   static bool isValidNamedObject(const json_char * & ptr  DEPTH_PARAM) json_nothrow json_read_priority;
+	   static bool isValidObject(const json_char * & ptr  DEPTH_PARAM) json_nothrow json_read_priority;
+	   static bool isValidArray(const json_char * & ptr  DEPTH_PARAM) json_nothrow json_read_priority;
 	   static bool isValidRoot(const json_char * json) json_nothrow json_read_priority;
+		#ifdef JSON_STREAM
+			static bool isValidPartialRoot(const json_char * json) json_nothrow json_read_priority;
+		#endif
+	private: 
+		JSONValidator(void);
 };
 
 #endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONWorker.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONWorker.cpp Changed

@@ -1,51 +1,45 @@
 #include "JSONWorker.h"
 
+bool used_ascii_one = false;  //used to know whether or not to check for intermediates when writing, once flipped, can't be unflipped
+inline json_char ascii_one(void) json_nothrow {
+	used_ascii_one = true;
+	return JSON_TEXT('\1');
+}
+
 #ifdef JSON_READ_PRIORITY
 
 JSONNode JSONWorker::parse(const json_string & json) json_throws(std::invalid_argument) {
-    json_auto<json_char> s;
-    #if defined JSON_DEBUG || defined JSON_SAFE
-	   json_char lastchar;
-	   s.set(RemoveWhiteSpace(json, lastchar));
-	   return _parse_unformatted(s.ptr, lastchar);
-    #else
-	   s.set(RemoveWhiteSpace(json));
-	   return _parse_unformatted(s.ptr);
-    #endif
+	json_auto<json_char> s;
+	size_t len;
+	s.set(RemoveWhiteSpace(json, len, true));
+	return _parse_unformatted(s.ptr, s.ptr + len);
 }
 
 JSONNode JSONWorker::parse_unformatted(const json_string & json) json_throws(std::invalid_argument) {
     #if defined JSON_DEBUG || defined JSON_SAFE
 	   #ifndef JSON_NO_EXCEPTIONS
-		  JSON_ASSERT_SAFE((json[0] == '{') || (json[0] == '['), JSON_TEXT("Not JSON!"), throw std::invalid_argument(EMPTY_STD_STRING););
+		  JSON_ASSERT_SAFE((json[0] == JSON_TEXT('{')) || (json[0] == JSON_TEXT('[')), JSON_TEXT("Not JSON!"), throw std::invalid_argument(json_global(EMPTY_STD_STRING)););
 	   #else
-		  JSON_ASSERT_SAFE((json[0] == '{') || (json[0] == '['), JSON_TEXT("Not JSON!"), return JSONNode(JSON_NULL););
+		  JSON_ASSERT_SAFE((json[0] == JSON_TEXT('{')) || (json[0] == JSON_TEXT('[')), JSON_TEXT("Not JSON!"), return JSONNode(JSON_NULL););
 	   #endif
-	   json_char temp = (json[0] == '{') ? '}' : ']';
-	   return _parse_unformatted(json.c_str(), temp);
-    #else
-	   return _parse_unformatted(json.c_str());
     #endif
+	return _parse_unformatted(json.data(), json.data() + json.length());
 }
 
-#if defined JSON_DEBUG || defined JSON_SAFE
-JSONNode JSONWorker::_parse_unformatted(const json_char * json, json_char & lastchar) json_throws(std::invalid_argument) {
-#else
-JSONNode JSONWorker::_parse_unformatted(const json_char * json) json_throws(std::invalid_argument) {
-#endif
+JSONNode JSONWorker::_parse_unformatted(const json_char * json, const json_char * const end) json_throws(std::invalid_argument) {
     #ifdef JSON_COMMENTS
 	   json_char firstchar = *json;
 	   json_string _comment;
 	   json_char * runner = (json_char*)json;
-	   if (json_unlikely(firstchar == '\5')){  //multiple comments will be consolidated into one
+	   if (json_unlikely(firstchar == JSON_TEMP_COMMENT_IDENTIFIER)){  //multiple comments will be consolidated into one
 		  newcomment:
-		  while(*(++runner) != '\5'){
-			 JSON_ASSERT(*runner, JSON_TEXT("Removing white space failed"));
+		  while(*(++runner) != JSON_TEMP_COMMENT_IDENTIFIER){
+			 JSON_ASSERT(runner != end, JSON_TEXT("Removing white space failed"));
 			 _comment += *runner;
 		  }
 		  firstchar = *(++runner); //step past the trailing tag
-		  if (json_unlikely(firstchar == '\5')){
-			 _comment += '\n';
+		  if (json_unlikely(firstchar == JSON_TEMP_COMMENT_IDENTIFIER)){
+			 _comment += JSON_TEXT('\n');
 			 goto newcomment;
 		  }
 	   }
@@ -54,33 +48,33 @@
     #endif
 
     switch (firstchar){
-        case '{':
-        case '[':
+        case JSON_TEXT('{'):
+        case JSON_TEXT('['):
 		  #if defined JSON_DEBUG || defined JSON_SAFE
-			 if (firstchar == '['){
-				if (json_unlikely(lastchar != ']')){
+			 if (firstchar == JSON_TEXT('[')){
+				if (json_unlikely(*(end - 1) != JSON_TEXT(']'))){
 				    JSON_FAIL(JSON_TEXT("Missing final ]"));
 				    break;
 				}
 			 } else {
-				if (json_unlikely(lastchar != '}')){
+				if (json_unlikely(*(end - 1) != JSON_TEXT('}'))){
 				    JSON_FAIL(JSON_TEXT("Missing final }"));
 				    break;
 				}
 			 }
 		  #endif
 		  #ifdef JSON_COMMENTS
-			 JSONNode foo(runner);
+			 JSONNode foo(json_string(runner, end - runner));
 			 foo.set_comment(_comment);
 			 return JSONNode(true, foo);  //forces it to simply return the original interal, even with ref counting off
 		  #else
-			 return JSONNode(json);
+			 return JSONNode(json_string(json, end - json));
 		  #endif
     }
 
     JSON_FAIL(JSON_TEXT("Not JSON!"));
     #ifndef JSON_NO_EXCEPTIONS
-	   throw std::invalid_argument(EMPTY_STD_STRING);
+	   throw std::invalid_argument(json_global(EMPTY_STD_STRING));
     #else
 	   return JSONNode(JSON_NULL);
     #endif
@@ -124,10 +118,18 @@
 
 
 
-#ifdef JSON_READ_PRIORITY
-    size_t JSONWorker::FindNextRelevant(json_char ch, const json_string & value_t, const size_t pos) json_nothrow {
-	   const json_char * start = value_t.c_str();
-	   for (const json_char * p = start + pos; *p; ++p){
+#if defined(JSON_READ_PRIORITY) || defined(JSON_STREAM)
+	#if (JSON_READ_PRIORITY == HIGH) && (!(defined(JSON_LESS_MEMORY)))
+		#define FIND_NEXT_RELEVANT(ch, vt, po) JSONWorker::FindNextRelevant<ch>(vt, po)
+		template<json_char ch>
+		size_t JSONWorker::FindNextRelevant(const json_string & value_t, const size_t pos) json_nothrow {
+	#else
+		#define FIND_NEXT_RELEVANT(ch, vt, po) JSONWorker::FindNextRelevant(ch, vt, po)
+		size_t JSONWorker::FindNextRelevant(json_char ch, const json_string & value_t, const size_t pos) json_nothrow {
+	#endif
+		json_string::const_iterator start = value_t.begin();
+		json_string::const_iterator e = value_t.end();
+	   for (json_string::const_iterator p = value_t.begin() + pos; p != e; ++p){
 		  if (json_unlikely(*p == ch)) return p - start;
 		  switch (*p){
 				BRACKET(JSON_TEXT('['), JSON_TEXT(']'))
@@ -140,12 +142,12 @@
 #endif
 
 #ifdef JSON_COMMENTS
-    #define COMMENT_DELIMITER() *runner++ = '\5'
+    #define COMMENT_DELIMITER() *runner++ = JSON_TEMP_COMMENT_IDENTIFIER
     #define AND_RUNNER ,runner
-    inline void SingleLineComment(const json_char * & p, json_char * & runner) json_nothrow {
+    inline void SingleLineComment(const json_char * & p, const json_char * const end, json_char * & runner) json_nothrow {
 	   //It is okay to add two '\5' characters here because at minimun the # and '\n' are replaced, so it's at most the same size
 	   COMMENT_DELIMITER();
-	   while((*(++p)) && (*p != JSON_TEXT('\n'))){
+	   while((++p != end) && (*p != JSON_TEXT('\n'))){
 		  *runner++ = *p;
 	   }
 	   COMMENT_DELIMITER();
@@ -156,129 +158,106 @@
 #endif
 
 #ifndef JSON_STRICT
-inline void SingleLineComment(const json_char * & p) json_nothrow {
-    while((*(++p)) && (*p != JSON_TEXT('\n')));
+inline void SingleLineComment(const json_char * & p, const json_char * const end) json_nothrow {
+    while((++p != end) && (*p != JSON_TEXT('\n')));
 }
 #endif
 
-#ifdef JSON_READ_PRIORITY
-#if defined JSON_DEBUG || defined JSON_SAFE
-    json_char * JSONWorker::RemoveWhiteSpace(const json_string & value_t, json_char & last) json_nothrow  {
+#if defined(JSON_LESS_MEMORY) && defined(JSON_READ_PRIORITY)
+	#define PRIVATE_REMOVEWHITESPACE(T, value_t, escapeQuotes, len) private_RemoveWhiteSpace(T, value_t, escapeQuotes, len)
+	json_char * private_RemoveWhiteSpace(bool T, const json_string & value_t, bool escapeQuotes, size_t & len) json_nothrow {
 #else
-    json_char * JSONWorker::RemoveWhiteSpace(const json_string & value_t) json_nothrow {
-#endif
-	   json_char * result;
-	   json_char * runner = result = json_malloc<json_char>(value_t.length() + 1);  //dealing with raw memory is faster than adding to a json_string
-	   JSON_ASSERT(result != 0, JSON_TEXT("Out of memory"));
-	   for(const json_char * p = value_t.c_str(); *p; ++p){
-		  switch(*p){
-			 case JSON_TEXT(' '):   //defined as white space
-			 case JSON_TEXT('\t'):  //defined as white space
-			 case JSON_TEXT('\n'):  //defined as white space
-			 case JSON_TEXT('\r'):  //defined as white space
-				break;
-			 #ifndef JSON_STRICT
-				case JSON_TEXT('/'):  //a C comment
-				    if (*(++p) == JSON_TEXT('*')){  //a multiline comment
-					   COMMENT_DELIMITER();
-					   while ((*(++p) != JSON_TEXT('*')) || (*(p + 1) != JSON_TEXT('/'))){
-						  JSON_ASSERT_SAFE(*p, JSON_TEXT("Null terminator inside of a multiline quote"), COMMENT_DELIMITER(); goto endofloop;);
-						  *runner++ = *p;
-					   }
-					   ++p;
-					   COMMENT_DELIMITER();
-					   break;
-				    }
-				    //Should be a single line C comment, so let it fall through to use the bash comment stripper
-				    JSON_ASSERT_SAFE(*p == JSON_TEXT('/'), JSON_TEXT("stray / character, not quoted, or a comment"), goto endofloop;);
-				case JSON_TEXT('#'):  //a bash comment
-				    SingleLineComment(p AND_RUNNER);
-				    break;
-			 #endif
-			 case JSON_TEXT('\"'):  //a quote
-				*runner++ = JSON_TEXT('\"');
-				while(*(++p) != JSON_TEXT('\"')){  //find the end of the quotation, as white space is preserved within it
-				    JSON_ASSERT_SAFE(*p, JSON_TEXT("Null terminator inside of a quotation"), goto endofloop;);
-				    switch(*p){
-					   case JSON_TEXT('\\'):
-						  *runner++ = JSON_TEXT('\\');
-						  *runner++ = (*++p == JSON_TEXT('\"')) ? JSON_TEXT('\1') : *p;  //an escaped quote will reak havoc will all of my searching functions, so change it into an illegal character in JSON for convertion later on
-						  break;
-					   default:
-						  *runner++ = *p;
-						  break;
-				    }
-				}
-				//no break, let it fall through so that the trailing quote gets added
-			 default:
-				JSON_ASSERT_SAFE((json_uchar)*p >= 32, JSON_TEXT("Invalid JSON character detected (lo)"), goto endofloop;);
-				JSON_ASSERT_SAFE((json_uchar)*p <= 126, JSON_TEXT("Invalid JSON character detected (hi)"), goto endofloop;);
-				*runner++ = *p;
-				break;
-		  }
-	   }
-	   #ifdef JSON_SAFE
-		  endofloop:
-	   #endif
-	   #if defined JSON_DEBUG || defined JSON_SAFE
-		  last = *(runner - 1);
-	   #endif
-	   *runner = JSON_TEXT('\0');
-	   return result;
-    }
+	#define PRIVATE_REMOVEWHITESPACE(T, value_t, escapeQuotes, len) private_RemoveWhiteSpace<T>(value_t, escapeQuotes, len)
+	template<bool T>
+	json_char * private_RemoveWhiteSpace(const json_string & value_t, bool escapeQuotes, size_t & len) json_nothrow {
 #endif
-
-json_string JSONWorker::RemoveWhiteSpaceAndComments(const json_string & value_t) json_nothrow {
-    json_string result;
-    result.reserve(value_t.length());
-    for(const json_char * p = value_t.c_str(); *p; ++p){
-	   switch(*p){
-		  case JSON_TEXT(' '):   //defined as white space
-		  case JSON_TEXT('\t'):  //defined as white space
-		  case JSON_TEXT('\n'):  //defined as white space
-		  case JSON_TEXT('\r'):  //defined as white space
-			 break;
-		  #ifndef JSON_STRICT
-			 case JSON_TEXT('/'):  //a C comment
+	json_char * result;
+	json_char * runner = result = json_malloc<json_char>(value_t.length() + 1);  //dealing with raw memory is faster than adding to a json_string
+	JSON_ASSERT(result != 0, json_global(ERROR_OUT_OF_MEMORY));
+	const json_char * const end = value_t.data() + value_t.length();
+	for(const json_char * p = value_t.data(); p != end; ++p){
+	  switch(*p){
+		 case JSON_TEXT(' '):   //defined as white space
+		 case JSON_TEXT('\t'):  //defined as white space
+		 case JSON_TEXT('\n'):  //defined as white space
+		 case JSON_TEXT('\r'):  //defined as white space
+			break;
+		#ifndef JSON_STRICT
+			case JSON_TEXT('/'):  //a C comment
 				if (*(++p) == JSON_TEXT('*')){  //a multiline comment
-				    while ((*(++p) != JSON_TEXT('*')) || (*(p + 1) != JSON_TEXT('/'))){
-					   JSON_ASSERT_SAFE(*p, JSON_TEXT("Null terminator inside of a multiline quote"), goto endofloop;);
-				    }
-				    ++p;
-				    break;
+				   if (T) COMMENT_DELIMITER();
+				   while ((*(++p) != JSON_TEXT('*')) || (*(p + 1) != JSON_TEXT('/'))){
+					  if(p == end){
+							COMMENT_DELIMITER(); 
+							goto endofrunner;
+						}
+					  if (T) *runner++ = *p;
+				   }
+				   ++p;
+				   if (T) COMMENT_DELIMITER();
+				   break;
 				}
 				//Should be a single line C comment, so let it fall through to use the bash comment stripper
-				JSON_ASSERT_SAFE(*p == JSON_TEXT('/'), JSON_TEXT("stray / character, not quoted, or a comment"), goto endofloop;);
-			 case JSON_TEXT('#'):  //a bash comment
-				SingleLineComment(p);
+				JSON_ASSERT_SAFE(*p == JSON_TEXT('/'), JSON_TEXT("stray / character, not quoted, or a comment"), goto endofrunner;);
+			case JSON_TEXT('#'):  //a bash comment
+				if (T){
+					SingleLineComment(p, end AND_RUNNER);
+				} else {
+					SingleLineComment(p, end);
+				}
 				break;
-		  #endif
-		  case JSON_TEXT('\"'):  //a quote
-			 result += JSON_TEXT('\"');
-			 while(*(++p) != JSON_TEXT('\"')){  //find the end of the quotation, as white space is preserved within it
-				JSON_ASSERT_SAFE(*p, JSON_TEXT("Null terminator inside of a quotation"), goto endofloop;);
+		 #endif
+		 case JSON_TEXT('\"'):  //a quote
+			*runner++ = JSON_TEXT('\"');
+			while(*(++p) != JSON_TEXT('\"')){  //find the end of the quotation, as white space is preserved within it
+				if(p == end) goto endofrunner;
 				switch(*p){
-				    case JSON_TEXT('\\'):
-					   result += JSON_TEXT('\\');
-					   result += (*++p == JSON_TEXT('\"')) ? JSON_TEXT('\1') : *p;  //an escaped quote will reak havoc will all of my searching functions, so change it into an illegal character in JSON for convertion later on
-					   break;
-				    default:
-					   result += *p;
-					   break;
+				   case JSON_TEXT('\\'):
+					  *runner++ = JSON_TEXT('\\');
+					  if (escapeQuotes){
+							*runner++ = (*++p == JSON_TEXT('\"')) ? ascii_one() : *p;  //an escaped quote will reak havoc will all of my searching functions, so change it into an illegal character in JSON for convertion later on
+					  } else {
+							*runner++ = *++p;
+					  }
+					  break;
+				   default:
+					  *runner++ = *p;
+					  break;
 				}
-			 }
-			 //no break, let it fall through so that the trailing quote gets added
-		  default:
-			 JSON_ASSERT_SAFE((json_uchar)*p >= 32, JSON_TEXT("Invalid JSON character detected (lo)"), goto endofloop;);
-			 JSON_ASSERT_SAFE((json_uchar)*p <= 126, JSON_TEXT("Invalid JSON character detected (hi)"), goto endofloop;);
-			 result += *p;
-			 break;
-	   }
+			}
+			//no break, let it fall through so that the trailing quote gets added
+		 default:
+			JSON_ASSERT_SAFE((json_uchar)*p >= 32, JSON_TEXT("Invalid JSON character detected (lo)"), goto endofrunner;);
+			JSON_ASSERT_SAFE((json_uchar)*p <= 126, JSON_TEXT("Invalid JSON character detected (hi)"), goto endofrunner;);
+			*runner++ = *p;
+			break;
+	  }
+	}
+	endofrunner:
+	len = runner - result;
+	return result;
+}
+
+#ifdef JSON_READ_PRIORITY
+    json_char * JSONWorker::RemoveWhiteSpace(const json_string & value_t, size_t & len, bool escapeQuotes) json_nothrow  {
+		json_char * result = PRIVATE_REMOVEWHITESPACE(true, value_t, escapeQuotes, len); 
+		result[len] = JSON_TEXT('\0');
+		return result;
     }
-    #ifdef JSON_SAFE
-	   endofloop:
-    #endif
-    return result;
+#endif
+
+json_char * JSONWorker::RemoveWhiteSpaceAndCommentsC(const json_string & value_t, bool escapeQuotes) json_nothrow {
+	size_t len;
+	json_char * result = PRIVATE_REMOVEWHITESPACE(false, value_t, escapeQuotes, len);
+	result[len] = JSON_TEXT('\0');
+	return result;
+}
+
+json_string JSONWorker::RemoveWhiteSpaceAndComments(const json_string & value_t, bool escapeQuotes) json_nothrow {
+	json_auto<json_char> s;
+    size_t len;
+	s.set(PRIVATE_REMOVEWHITESPACE(false, value_t, escapeQuotes, len)); 
+	return json_string(s.ptr, len);
 }
 
 #ifdef JSON_READ_PRIORITY
@@ -294,14 +273,14 @@
 	   return (((hi << 10) & 0x1FFC00) + 0x10000) | lo & 0x3FF;
     }
 
-    json_string JSONWorker::UTF(const json_char * & pos) json_nothrow {
-	   json_string result;
-	   json_uchar first = UTF8(pos);
+    void JSONWorker::UTF(const json_char * & pos, json_string & result, const json_char * const end) json_nothrow {
+		JSON_ASSERT_SAFE(((long long int )end - (long long int )pos) > 4, JSON_TEXT("UTF will go out of bounds"), return;);
+	   json_uchar first = UTF8(pos, end);
 	   if (json_unlikely((first > 0xD800) && (first < 0xDBFF) &&
 		  (*(pos + 1) == '\\') && (*(pos + 2) == 'u'))){
 			 const json_char * original_pos = pos;  //if the 2nd character is not correct I need to roll back the iterator
 			 pos += 2;
-			 json_uchar second = UTF8(pos);
+			 json_uchar second = UTF8(pos, end);
 			 //surrogate pair, not two characters
 			 if (json_unlikely((second > 0xDC00) && (second < 0xDFFF))){
 				result += SurrogatePair(first, second);
@@ -311,12 +290,11 @@
 	   } else {
 		  result += first;
 	   }
-	   JSON_ASSERT(!result.empty(), JSON_TEXT("missing case, somehow UTF returned empty"));
-	   return result;
     }
 #endif
 
-json_uchar JSONWorker::UTF8(const json_char * & pos) json_nothrow {
+json_uchar JSONWorker::UTF8(const json_char * & pos, const json_char * const end) json_nothrow {
+	JSON_ASSERT_SAFE(((long long int)end - (long long int)pos) > 4, JSON_TEXT("UTF will go out of bounds"), return JSON_TEXT('\0'););
     #ifdef JSON_UNICODE
 	   ++pos;
 	   json_uchar temp = Hex(pos) << 8;
@@ -358,14 +336,15 @@
 }
 
 #ifndef JSON_STRICT
-    inline json_char FromOctal(const json_char * & str) json_nothrow {
-	   JSON_ASSERT(json_strlen(str) > 3, JSON_TEXT("Octal will go out of bounds"));
+    inline json_char FromOctal(const json_char * & str, const json_char * const end) json_nothrow {
+	   JSON_ASSERT_SAFE(((long long int)end - (long long int)str) > 3, JSON_TEXT("Octal will go out of bounds"), return JSON_TEXT('\0'););
 	   str += 2;
 	   return (json_char)(((((json_uchar)(*(str - 2) - 48))) << 6) | (((json_uchar)(*(str - 1) - 48)) << 3) | ((json_uchar)(*str - 48)));
     }
 #endif
 
-void JSONWorker::SpecialChar(const json_char * & pos, json_string & res) json_nothrow {
+void JSONWorker::SpecialChar(const json_char * & pos, const json_char * const end, json_string & res) json_nothrow {
+	JSON_ASSERT_SAFE(pos != end, JSON_TEXT("Special char termantion"), return;);
     /*
 	   Since JSON uses forward slash escaping for special characters within strings, I have to
 	   convert these escaped characters into C characters
@@ -400,13 +379,14 @@
 		  break;
 	   case JSON_TEXT('u'):	//utf character
 		  #ifdef JSON_UNICODE
-			 res += UTF(pos);
+			 UTF(pos, res, end);
 		  #else
-			 res += UTF8(pos);
+			 res += UTF8(pos, end);
 		  #endif
 		  break;
 	   #ifndef JSON_STRICT
 		  case JSON_TEXT('x'):   //hexidecimal ascii code
+			 JSON_ASSERT_SAFE(((long long int )end - (long long int )pos) > 3, JSON_TEXT("Hex will go out of bounds"), res += JSON_TEXT('\0'); return;);
 			 res += Hex(++pos);
 			 break;
 
@@ -423,7 +403,7 @@
 			 case JSON_TEXT('6'):
 			 case JSON_TEXT('7'):
 		  #endif
-			 res += FromOctal(pos);
+			 res += FromOctal(pos, end);
 			 break;
 		  default:
 			 res += *pos;
@@ -456,18 +436,20 @@
     setflag(false);
     json_string res;
     res.reserve(value_t.length());	 //since it goes one character at a time, want to reserve it first so that it doens't have to reallocating
-    for(const json_char * p = value_t.c_str(); *p; ++p){
+	const json_char * const end = value_t.data() + value_t.length();
+    for(const json_char * p = value_t.data(); p != end; ++p){
 	   switch (*p){
 		  case JSON_TEXT('\\'):
 			 setflag(true);
-			 SpecialChar(++p, res);
+			 SpecialChar(++p, end, res);
 			 break;
 		  default:
 			 res += *p;
 			 break;
 	   }
     }
-    return shrinkString(res);  //because this is actually setting something to be stored, shrink it it need be
+	shrinkString(res);  //because this is actually setting something to be stored, shrink it it need be
+	return res;
 }
 #endif
 
@@ -482,7 +464,7 @@
 		  unsigned short HiSurrogate = 0xD800 | (((unsigned short)((unsigned int)((C >> 16) & 31)) - 1) << 6) | ((unsigned short)C) >> 10;
 
 		  //compute the low surrogate
-		  unsigned short LoSurrogate = (unsigned short) (0xDC00 | ((unsigned short)C) & 1023);
+		  unsigned short LoSurrogate = (unsigned short) (0xDC00 | ((unsigned short)C & 1023));
 
 		  json_string res;
 		  res += toUTF8(HiSurrogate);
@@ -522,12 +504,14 @@
     }
 #endif
 
-json_string JSONWorker::UnfixString(const json_string & value_t, bool flag) json_nothrow {
-    if (!flag) return value_t;
+void JSONWorker::UnfixString(const json_string & value_t, bool flag, json_string & res) json_nothrow {
+    if (!flag){
+		res += value_t;
+		return;
+	}
     //Re-escapes a json_string so that it can be written out into a JSON file
-    json_string res;
-    res.reserve(value_t.length());  //since it goes one character at a time, want to reserve it first so that it doens't have to reallocating
-    for(const json_char * p = value_t.c_str(); *p; ++p){
+	const json_char * const end = value_t.data() + value_t.length();
+    for(const json_char * p = value_t.data(); p != end; ++p){
 	   switch(*p){
 		  case JSON_TEXT('\"'):  //quote character
 			 res += JSON_TEXT("\\\"");
@@ -555,11 +539,13 @@
 				res += JSON_TEXT("\\f");
 				break;
 			 default:
+			 {
 				if (json_unlikely(((json_uchar)(*p) < 32) || ((json_uchar)(*p) > 126))){
 				    res += toUTF8((json_uchar)(*p));
 				} else {
 				    res += *p;
 				}
+			}
 				break;
 		  #else
 			 default:
@@ -568,7 +554,6 @@
 		  #endif
 	   }
     }
-    return res;
 }
 
 #ifdef JSON_READ_PRIORITY
@@ -584,15 +569,23 @@
 	   START_MEM_SCOPE
 		  json_string _comment;
 		  START_MEM_SCOPE
-			 const json_char * runner = ((array) ? value.c_str() : name.c_str());
-			 if (json_unlikely(*runner == '\5')){  //multiple comments will be consolidated into one
-				newcomment:
-				while(*(++runner) != '\5'){
-				    JSON_ASSERT(*runner, JSON_TEXT("Removing white space failed"));
-				    _comment += *runner;
+			 const json_char * runner = ((array) ? value.data() : name.data());
+			 #ifdef JSON_DEBUG
+				const json_char * const end = runner + value.length();
+			#endif
+			 if (json_unlikely(*runner == JSON_TEMP_COMMENT_IDENTIFIER)){  //multiple comments will be consolidated into one
+				size_t count;
+				const json_char * start;
+			    newcomment:
+				count = 0;
+				start = runner + 1;
+				while(*(++runner) != JSON_TEMP_COMMENT_IDENTIFIER){
+				    JSON_ASSERT(runner != end, JSON_TEXT("Removing white space failed"));
+					++count;
 				}
-				if (json_unlikely(*(++runner) == '\5')){ //step past the trailing tag
-				    _comment += '\n';
+				if (count) _comment += json_string(start, count);
+				if (json_unlikely(*(++runner) == JSON_TEMP_COMMENT_IDENTIFIER)){ //step past the trailing tag
+				    _comment += JSON_TEXT('\n');
 				    goto newcomment;
 				}
 			 }
@@ -609,73 +602,73 @@
 	   const_cast<internalJSONNode*>(parent) -> CHILDREN -> push_back(child);   //attach it to the parent node
     #else
 	if (name.empty()){
-	   	const_cast<internalJSONNode*>(parent) -> CHILDREN -> push_back(JSONNode::newJSONNode(internalJSONNode::newInternal(name.c_str(), value)));	    //attach it to the parent node
+	   	const_cast<internalJSONNode*>(parent) -> CHILDREN -> push_back(JSONNode::newJSONNode(internalJSONNode::newInternal(name, value)));	    //attach it to the parent node
 	} else {
-		const_cast<internalJSONNode*>(parent) -> CHILDREN -> push_back(JSONNode::newJSONNode(internalJSONNode::newInternal(name.c_str() + 1, value)));	    //attach it to the parent node
+		const_cast<internalJSONNode*>(parent) -> CHILDREN -> push_back(JSONNode::newJSONNode(internalJSONNode::newInternal(json_string(name.begin() + 1, name.end()), value)));	    //attach it to the parent node
 	}
     #endif
 }
 
 //Create a subarray
 void JSONWorker::DoArray(const internalJSONNode * parent, const json_string & value_t) json_nothrow {
-    //This takes an array and creates nodes out of them
-    JSON_ASSERT(!value_t.empty(), JSON_TEXT("DoArray is empty"));
-    JSON_ASSERT_SAFE(value_t[0] == JSON_TEXT('['), JSON_TEXT("DoArray is not an array"), parent -> Nullify(); return;);
-    if (json_unlikely(value_t.length() <= 2)) return;  // just a [] (blank array)
-
-    #ifdef JSON_SAFE
-	   json_string newValue;  //share this so it has a reserved buffer
-    #endif
-    size_t starting = 1;  //ignore the [
-
-    //Not sure what's in the array, so we have to use commas
-    for(size_t ending = FindNextRelevant(JSON_TEXT(','), value_t, 1);
-	   ending != json_string::npos;
-	   ending = FindNextRelevant(JSON_TEXT(','), value_t, starting)){
-
-	   #ifdef JSON_SAFE
-		  newValue.assign(value_t.begin() + starting, value_t.begin() + ending);
-		  JSON_ASSERT_SAFE(FindNextRelevant(JSON_TEXT(':'), newValue, 0) == json_string::npos, JSON_TEXT("Key/Value pairs are not allowed in arrays"), parent -> Nullify(); return;);
-		  NewNode(parent, EMPTY_JSON_STRING, newValue, true);
-	   #else
-		  NewNode(parent, EMPTY_JSON_STRING, json_string(value_t.begin() + starting, value_t.begin() + ending), true);
-	   #endif
-		  starting = ending + 1;
-    }
-    //since the last one will not find the comma, we have to add it here, but ignore the final ]
-
-    #ifdef JSON_SAFE
-	   newValue.assign(value_t.begin() + starting, value_t.end() - 1);
-	   JSON_ASSERT_SAFE(FindNextRelevant(JSON_TEXT(':'), newValue, 0) == json_string::npos, JSON_TEXT("Key/Value pairs are not allowed in arrays"), parent -> Nullify(); return;);
-	   NewNode(parent, EMPTY_JSON_STRING, newValue, true);
-    #else
-	   NewNode(parent, EMPTY_JSON_STRING, json_string(value_t.begin() + starting, value_t.end() - 1), true);
-    #endif
+	//This takes an array and creates nodes out of them
+	JSON_ASSERT(!value_t.empty(), JSON_TEXT("DoArray is empty"));
+	JSON_ASSERT_SAFE(value_t[0] == JSON_TEXT('['), JSON_TEXT("DoArray is not an array"), parent -> Nullify(); return;);
+	if (json_unlikely(value_t.length() <= 2)) return;  // just a [] (blank array)
+	
+	#ifdef JSON_SAFE
+		json_string newValue;  //share this so it has a reserved buffer
+	#endif
+	size_t starting = 1;  //ignore the [
+	
+	//Not sure what's in the array, so we have to use commas
+	for(size_t ending = FIND_NEXT_RELEVANT(JSON_TEXT(','), value_t, 1);
+		ending != json_string::npos;
+		ending = FIND_NEXT_RELEVANT(JSON_TEXT(','), value_t, starting)){
+		
+		#ifdef JSON_SAFE
+			newValue.assign(value_t.begin() + starting, value_t.begin() + ending);
+			JSON_ASSERT_SAFE(FIND_NEXT_RELEVANT(JSON_TEXT(':'), newValue, 0) == json_string::npos, JSON_TEXT("Key/Value pairs are not allowed in arrays"), parent -> Nullify(); return;);
+			NewNode(parent, json_global(EMPTY_JSON_STRING), newValue, true);
+		#else
+			NewNode(parent, json_global(EMPTY_JSON_STRING), json_string(value_t.begin() + starting, value_t.begin() + ending), true);
+		#endif
+		starting = ending + 1;
+	}
+	//since the last one will not find the comma, we have to add it here, but ignore the final ]
+	
+	#ifdef JSON_SAFE
+		newValue.assign(value_t.begin() + starting, value_t.end() - 1);
+		JSON_ASSERT_SAFE(FIND_NEXT_RELEVANT(JSON_TEXT(':'), newValue, 0) == json_string::npos, JSON_TEXT("Key/Value pairs are not allowed in arrays"), parent -> Nullify(); return;);
+		NewNode(parent, json_global(EMPTY_JSON_STRING), newValue, true);
+	#else
+		NewNode(parent, json_global(EMPTY_JSON_STRING), json_string(value_t.begin() + starting, value_t.end() - 1), true);
+	#endif
 }
 
 
 //Create all child nodes
-void JSONWorker::DoNode(const internalJSONNode * parent, const json_string & value_t) json_nothrow {
-    //This take a node and creates its members and such
-    JSON_ASSERT(!value_t.empty(), JSON_TEXT("DoNode is empty"));
-    JSON_ASSERT_SAFE(value_t[0] == JSON_TEXT('{'), JSON_TEXT("DoNode is not an node"), parent -> Nullify(); return;);
-    if (json_unlikely(value_t.length() <= 2)) return;  // just a {} (blank node)
-
-    size_t name_ending = FindNextRelevant(JSON_TEXT(':'), value_t, 1);  //find where the name ends
-    JSON_ASSERT_SAFE(name_ending != json_string::npos, JSON_TEXT("Missing :"), parent -> Nullify(); return;);
-    json_string name(value_t.begin() + 1, value_t.begin() + name_ending - 1);	  //pull the name out
-    for (size_t value_ending = FindNextRelevant(JSON_TEXT(','), value_t, name_ending),  //find the end of the value
-	    name_starting = 1;  //ignore the {
-	    value_ending != json_string::npos;
-	    value_ending = FindNextRelevant(JSON_TEXT(','), value_t, name_ending)){
-
-	   NewNode(parent, name, json_string(value_t.begin() + name_ending + 1, value_t.begin() + value_ending), false);
-	   name_starting = value_ending + 1;
-	   name_ending = FindNextRelevant(JSON_TEXT(':'), value_t, name_starting);
-	   JSON_ASSERT_SAFE(name_ending != json_string::npos, JSON_TEXT("Missing :"), parent -> Nullify(); return;);
-	   name.assign(value_t.begin() + name_starting, value_t.begin() + name_ending - 1);
-    }
-    //since the last one will not find the comma, we have to add it here
-    NewNode(parent, name, json_string(value_t.begin() + name_ending + 1, value_t.end() - 1), false);
+void JSONWorker::DoNode(const internalJSONNode * parent, const json_string & value_t) json_nothrow {	
+	//This take a node and creates its members and such
+	JSON_ASSERT(!value_t.empty(), JSON_TEXT("DoNode is empty"));
+	JSON_ASSERT_SAFE(value_t[0] == JSON_TEXT('{'), JSON_TEXT("DoNode is not an node"), parent -> Nullify(); return;);
+	if (json_unlikely(value_t.length() <= 2)) return;  // just a {} (blank node)
+	
+	size_t name_ending = FIND_NEXT_RELEVANT(JSON_TEXT(':'), value_t, 1);  //find where the name ends
+	JSON_ASSERT_SAFE(name_ending != json_string::npos, JSON_TEXT("Missing :"), parent -> Nullify(); return;);
+	json_string name(value_t.begin() + 1, value_t.begin() + name_ending - 1);	  //pull the name out
+	for (size_t value_ending = FIND_NEXT_RELEVANT(JSON_TEXT(','), value_t, name_ending),  //find the end of the value
+		 name_starting = 1;  //ignore the {
+		 value_ending != json_string::npos;
+		 value_ending = FIND_NEXT_RELEVANT(JSON_TEXT(','), value_t, name_ending)){
+		
+		NewNode(parent, name, json_string(value_t.begin() + name_ending + 1, value_t.begin() + value_ending), false);
+		name_starting = value_ending + 1;
+		name_ending = FIND_NEXT_RELEVANT(JSON_TEXT(':'), value_t, name_starting);
+		JSON_ASSERT_SAFE(name_ending != json_string::npos, JSON_TEXT("Missing :"), parent -> Nullify(); return;);
+		name.assign(value_t.begin() + name_starting, value_t.begin() + name_ending - 1);
+	}
+	//since the last one will not find the comma, we have to add it here
+	NewNode(parent, name, json_string(value_t.begin() + name_ending + 1, value_t.end() - 1), false);
 }
 #endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONWorker.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONWorker.h Changed

@@ -2,26 +2,20 @@
 #define JSON_WORKER_H
 
 #include "JSONNode.h"
+#include "JSONSharedString.h"
 
 class JSONWorker {
 public:
-    static json_string RemoveWhiteSpaceAndComments(const json_string & value_t) json_nothrow json_read_priority;
+    static json_string RemoveWhiteSpaceAndComments(const json_string & value_t, bool escapeQuotes) json_nothrow json_read_priority;
+	static json_char * RemoveWhiteSpaceAndCommentsC(const json_string & value_t, bool escapeQuotes) json_nothrow json_read_priority;
 
     #ifdef JSON_READ_PRIORITY
 	   static JSONNode parse(const json_string & json) json_throws(std::invalid_argument) json_read_priority;
 	   static JSONNode parse_unformatted(const json_string & json) json_throws(std::invalid_argument) json_read_priority;
 
-	   #if defined JSON_DEBUG || defined JSON_SAFE
-		  static JSONNode _parse_unformatted(const json_char * json, json_char & lastchar) json_throws(std::invalid_argument) json_read_priority;
-	   #else
-		  static JSONNode _parse_unformatted(const json_char * json) json_throws(std::invalid_argument) json_read_priority;
-	   #endif
+		static JSONNode _parse_unformatted(const json_char * json, const json_char * const end) json_throws(std::invalid_argument) json_read_priority;
 
-	   #if defined JSON_DEBUG || defined JSON_SAFE
-		  static json_char * RemoveWhiteSpace(const json_string & value_t, json_char & last) json_nothrow json_read_priority;
-	   #else
-		  static json_char * RemoveWhiteSpace(const json_string & value_t) json_nothrow json_read_priority;
-	   #endif
+		static json_char * RemoveWhiteSpace(const json_string & value_t, size_t & len, bool escapeQuotes) json_nothrow json_read_priority;
 
 	   static void DoArray(const internalJSONNode * parent, const json_string & value_t) json_nothrow json_read_priority;
 	   static void DoNode(const internalJSONNode * parent, const json_string & value_t) json_nothrow json_read_priority;
@@ -38,27 +32,34 @@
     #endif
 
     #if defined(JSON_READ_PRIORITY) || defined(JSON_STREAM)
-	   static size_t FindNextRelevant(json_char ch, const json_string & value_t, const size_t pos) json_nothrow json_read_priority;
+		#if (JSON_READ_PRIORITY == HIGH) && (!(defined(JSON_LESS_MEMORY)))
+			template<json_char ch>
+			static size_t FindNextRelevant(const json_string & value_t, const size_t pos) json_nothrow json_read_priority;
+		#else
+			static size_t FindNextRelevant(json_char ch, const json_string & value_t, const size_t pos) json_nothrow json_read_priority;
+		#endif
     #endif
-    static json_string UnfixString(const json_string & value_t, bool flag) json_nothrow;
+    static void UnfixString(const json_string & value_t, bool flag, json_string & res) json_nothrow;
 JSON_PRIVATE
     #ifdef JSON_READ_PRIORITY
 	   static json_char Hex(const json_char * & pos) json_nothrow;
-	   static json_uchar UTF8(const json_char * & pos) json_nothrow;
+	   static json_uchar UTF8(const json_char * & pos, const json_char * const end) json_nothrow;
     #endif
     #ifdef JSON_ESCAPE_WRITES
 	   static json_string toUTF8(json_uchar p) json_nothrow;
     #endif
     #ifdef JSON_UNICODE
-	   static json_string UTF(const json_char * & pos) json_nothrow;
+	   static void UTF(const json_char * & pos, json_string & result, const json_char * const end) json_nothrow;
 	   #ifdef JSON_ESCAPE_WRITES
 		  static json_string toSurrogatePair(json_uchar pos) json_nothrow;
 	   #endif
     #endif
     #ifdef JSON_READ_PRIORITY
-	   static void SpecialChar(const json_char * & pos, json_string & res) json_nothrow;
+	   static void SpecialChar(const json_char * & pos, const json_char * const end, json_string & res) json_nothrow;
 	   static void NewNode(const internalJSONNode * parent, const json_string & name, const json_string & value, bool array) json_nothrow;
     #endif
+private:
+    JSONWorker(void);
 };
 
 #endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONWriter.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSONWriter.cpp Changed

@@ -1,53 +1,88 @@
 #include "JSONNode.h"
 #ifdef JSON_WRITE_PRIORITY
 #include "JSONWorker.h"
+#include "JSONGlobals.h"
 
-const static json_string WRITER_EMPTY;
-#ifndef JSON_NEWLINE
-    const static json_string NEW_LINE(JSON_TEXT("\n"));
-#else
-    const static json_string NEW_LINE(JSON_TEXT(JSON_NEWLINE));
-#endif
+extern bool used_ascii_one;
 
 #ifdef JSON_INDENT
-    const static json_string INDENT(JSON_TEXT(JSON_INDENT));
-
     inline json_string makeIndent(unsigned int amount) json_nothrow json_write_priority;
     inline json_string makeIndent(unsigned int amount) json_nothrow {
-	   if (amount == 0xFFFFFFFF) return WRITER_EMPTY;
+	   if (amount == 0xFFFFFFFF) return json_global(EMPTY_JSON_STRING);
 	   json_string result;
-	   result.reserve(amount * INDENT.length());
+	   result.reserve(amount * json_global(INDENT).length());
 	   for(unsigned int i = 0; i < amount; ++i){
-		  result += INDENT;
+		  result += json_global(INDENT);
 	   }
-	   JSON_ASSERT(result.capacity == amount * INDENT.length(), JSON_TEXT("makeIndent made a string too big"));
+	   JSON_ASSERT(result.capacity() == amount * json_global(INDENT).length(), JSON_TEXT("makeIndent made a string too big"));
 	   return result;
     }
 #else
     inline json_string makeIndent(unsigned int amount) json_nothrow {
-	   if (amount == 0xFFFFFFFF) return WRITER_EMPTY;
-	   return json_string(amount, JSON_TEXT('\t'));
+		if (amount == 0xFFFFFFFF) return json_global(EMPTY_JSON_STRING);
+		if (json_likely(amount < 8)){
+			static const json_string cache[] = {
+				json_string(),
+				json_string(JSON_TEXT("\t")),
+				json_string(JSON_TEXT("\t\t")),
+				json_string(JSON_TEXT("\t\t\t")),
+				json_string(JSON_TEXT("\t\t\t\t")),
+				json_string(JSON_TEXT("\t\t\t\t\t")),
+				json_string(JSON_TEXT("\t\t\t\t\t\t")),
+				json_string(JSON_TEXT("\t\t\t\t\t\t\t"))
+			};
+			return cache[amount];
+		}
+		#ifndef JSON_LESS_MEMORY
+			if (json_likely(amount < 16)){
+				static const json_string cache[] = {
+					json_string(JSON_TEXT("\t\t\t\t\t\t\t\t")),
+					json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t")),
+					json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t")),
+					json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t")),
+					json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t")),
+					json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t")),
+					json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t")),
+					json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"))
+				};
+				return cache[amount - 8];
+			}
+			#if JSON_WRITE_PRIORITY == HIGH
+				if (json_likely(amount < 24)){
+					static const json_string cache[] = {
+						json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t")),
+						json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t")),
+						json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t")),
+						json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t")),
+						json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t")),
+						json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t")),
+						json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t")),
+						json_string(JSON_TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"))
+					};
+					return cache[amount - 16];
+				}
+			#endif
+		#endif
+		return json_string(amount, JSON_TEXT('\t'));
     }
 #endif
 
-json_string internalJSONNode::WriteName(bool formatted, bool arrayChild) const json_nothrow {
-    if (arrayChild){
-	   return WRITER_EMPTY ;
-    } else {
-	   return json_string(JSON_TEXT("\"")) + JSONWorker::UnfixString(_name, _name_encoded) + ((formatted) ? JSON_TEXT("\" : ") : JSON_TEXT("\":"));
+void internalJSONNode::WriteName(bool formatted, bool arrayChild, json_string & output) const json_nothrow {
+    if (!arrayChild){
+		output += JSON_TEXT("\"");
+		JSONWorker::UnfixString(_name, _name_encoded, output);
+		output += ((formatted) ? JSON_TEXT("\" : ") : JSON_TEXT("\":"));
     }
 }
 
-json_string internalJSONNode::WriteChildren(unsigned int indent) const json_nothrow {
+void internalJSONNode::WriteChildren(unsigned int indent, json_string & output) const json_nothrow {
     //Iterate through the children and write them
-    if (json_likely(CHILDREN -> empty())) return WRITER_EMPTY;
-
-    json_string res;
+    if (json_likely(CHILDREN -> empty())) return;
 
     json_string indent_plus_one;
     //handle whether or not it's formatted JSON
     if (indent != 0xFFFFFFFF){  //it's formatted, make the indentation strings
-	   indent_plus_one = NEW_LINE + makeIndent(++indent);
+	   indent_plus_one = json_global(NEW_LINE) + makeIndent(++indent);
     }
 
     //else it's not formatted, leave the indentation strings empty
@@ -56,22 +91,22 @@
     JSONNode ** it = CHILDREN -> begin();
     for(JSONNode ** it_end = CHILDREN -> end(); it != it_end; ++it, ++i){
 
-	   res += indent_plus_one + (*it) -> internal -> Write(indent, type() == JSON_ARRAY);
-	   if (json_likely(i < size_minus_one)) res += JSON_TEXT(",");  //the last one does not get a comma, but all of the others do
+		output += indent_plus_one;
+		(*it) -> internal -> Write(indent, type() == JSON_ARRAY, output);
+	    if (json_likely(i < size_minus_one)) output += JSON_TEXT(',');  //the last one does not get a comma, but all of the others do
     }
     if (indent != 0xFFFFFFFF){
-	   return res + NEW_LINE + makeIndent(indent - 1);
+		output += json_global(NEW_LINE);
+		output += makeIndent(indent - 1);
     }
-    return res;
 }
 
 #ifdef JSON_ARRAY_SIZE_ON_ONE_LINE
-    json_string internalJSONNode::WriteChildrenOneLine(unsigned int indent) const json_nothrow {
+    void internalJSONNode::WriteChildrenOneLine(unsigned int indent, json_string & output) const json_nothrow {
 	   //Iterate through the children and write them
-	   if (json_likely(CHILDREN -> empty())) return WRITER_EMPTY;
-	   if ((*CHILDREN -> begin()) -> internal -> isContainer()) return WriteChildren(indent);
+	   if (json_likely(CHILDREN -> empty())) return;
+	   if ((*CHILDREN -> begin()) -> internal -> isContainer()) return WriteChildren(indent, output);
 
-	   json_string res;
 	   json_string comma(JSON_TEXT(","));
 	   if (indent != 0xFFFFFFFF){
 		  comma += JSON_TEXT(' ');
@@ -82,105 +117,136 @@
 	   size_t i = 0;
 	   JSONNode ** it = CHILDREN -> begin();
 	   for(JSONNode ** it_end = CHILDREN -> end(); it != it_end; ++it, ++i){
-		  res += (*it) -> internal -> Write(indent, type() == JSON_ARRAY);
-		  if (json_likely(i < size_minus_one)) res += comma;  //the last one does not get a comma, but all of the others do
+		  (*it) -> internal -> Write(indent, type() == JSON_ARRAY, output);
+		  if (json_likely(i < size_minus_one)) output += comma;  //the last one does not get a comma, but all of the others do
 	   }
-	   return res;
     }
 #endif
 
 #ifdef JSON_COMMENTS
-    #ifdef JSON_WRITE_BASH_COMMENTS
-	   const static json_string SINGLELINE(JSON_TEXT("#"));
-    #else
-	   const static json_string SINGLELINE(JSON_TEXT("//"));
-    #endif
-
-    json_string internalJSONNode::WriteComment(unsigned int indent) const json_nothrow {
-	   if (indent == 0xFFFFFFFF) return WRITER_EMPTY;
-	   if (json_likely(_comment.empty())) return WRITER_EMPTY;
+    void internalJSONNode::WriteComment(unsigned int indent, json_string & output) const json_nothrow {
+	   if (indent == 0xFFFFFFFF) return;
+	   if (json_likely(_comment.empty())) return;
 	   size_t pos = _comment.find(JSON_TEXT('\n'));
+		
+	   const json_string current_indent(json_global(NEW_LINE) + makeIndent(indent));
+		
 	   if (json_likely(pos == json_string::npos)){  //Single line comment
-		  return NEW_LINE + makeIndent(indent) + SINGLELINE + _comment + NEW_LINE + makeIndent(indent);
+		   output += current_indent;
+		   output += json_global(SINGLELINE_COMMENT);
+		   output.append(_comment.begin(), _comment.end());
+		   output += current_indent;
+		   return;
 	   }
 
 	   /*
 	    Multiline comments
 	    */
-	   #if defined(JSON_WRITE_BASH_COMMENTS) || defined(JSON_WRITE_SINGLE_LINE_COMMENTS)
-		  json_string result(NEW_LINE + makeIndent(indent));
-	   #else
-		  json_string result(NEW_LINE + makeIndent(indent) + JSON_TEXT("/*") + NEW_LINE + makeIndent(indent + 1));
+		output += current_indent;
+	   #if !(defined(JSON_WRITE_BASH_COMMENTS) || defined(JSON_WRITE_SINGLE_LINE_COMMENTS))
+		  const json_string current_indent_plus_one(json_global(NEW_LINE) + makeIndent(indent + 1));
+		  output += JSON_TEXT("/*");
+		  output += current_indent_plus_one;
 	   #endif
 	   size_t old = 0;
 	   while(pos != json_string::npos){
 		  if (json_unlikely(pos && _comment[pos - 1] == JSON_TEXT('\r'))) --pos;
 		  #if defined(JSON_WRITE_BASH_COMMENTS) || defined(JSON_WRITE_SINGLE_LINE_COMMENTS)
-			 result += SINGLELINE;
+			 output += json_global(SINGLELINE_COMMENT);
 		  #endif
-		  result.append(_comment.begin() + old, _comment.begin() + pos);
-		  result += NEW_LINE;
+		  output.append(_comment.begin() + old, _comment.begin() + pos);
+		  
 		  #if defined(JSON_WRITE_BASH_COMMENTS) || defined(JSON_WRITE_SINGLE_LINE_COMMENTS)
-			 result += makeIndent(indent);
+			 output += current_indent;
 		  #else
-			 result += makeIndent(indent + 1);
+			 output += current_indent_plus_one;
 		  #endif
 		  old = (_comment[pos] == JSON_TEXT('\r')) ? pos + 2 : pos + 1;
 		  pos = _comment.find(JSON_TEXT('\n'), old);
 	   }
 	   #if defined(JSON_WRITE_BASH_COMMENTS) || defined(JSON_WRITE_SINGLE_LINE_COMMENTS)
-		  result += SINGLELINE;
+		  output += json_global(SINGLELINE_COMMENT);
 	   #endif
-	   result.append(_comment.begin() + old, _comment.end());
-	   result += NEW_LINE;
-	   result += makeIndent(indent);
-	   #if defined(JSON_WRITE_BASH_COMMENTS) || defined(JSON_WRITE_SINGLE_LINE_COMMENTS)
-		  return result;
-	   #else
-		  return result + JSON_TEXT("*/") + NEW_LINE + makeIndent(indent);
+	   output.append(_comment.begin() + old, _comment.end());
+	   output += current_indent;
+	   #if !(defined(JSON_WRITE_BASH_COMMENTS) || defined(JSON_WRITE_SINGLE_LINE_COMMENTS))
+		  output += JSON_TEXT("*/");
+		  output += current_indent;
 	   #endif
     }
 #else
-    inline json_string internalJSONNode::WriteComment(unsigned int) const json_nothrow {
-	   return WRITER_EMPTY;
-    }
+    inline void internalJSONNode::WriteComment(unsigned int, json_string &) const json_nothrow {}
 #endif
 
-json_string internalJSONNode::Write(unsigned int indent, bool arrayChild) const json_nothrow {
-    const bool formatted = indent != 0xFFFFFFFF;
+void internalJSONNode::DumpRawString(json_string & output) const json_nothrow {
+	//first remove the \1 characters
+	if (used_ascii_one){  //if it hasn't been used yet, don't bother checking
+		json_string result(_string.begin(), _string.end());
+		for(json_string::iterator beg = result.begin(), en = result.end(); beg != en; ++beg){
+			if (*beg == JSON_TEXT('\1')) *beg = JSON_TEXT('\"');
+		}
+		output += result;
+		return;
+	} else {
+		output.append(_string.begin(), _string.end());
+	}
+}
 
+void internalJSONNode::Write(unsigned int indent, bool arrayChild, json_string & output) const json_nothrow {
+    const bool formatted = indent != 0xFFFFFFFF;
+	WriteComment(indent, output);
+	
     #if !defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY)
 	   if (!(formatted || fetched)){  //It's not formatted or fetched, just do a raw dump
-		  return WriteComment(indent) + WriteName(false, arrayChild) + _string;
+		   WriteName(false, arrayChild, output);
+           //first remove the \1 characters
+		   DumpRawString(output);
+		   return;
 	   }
     #endif
 
+	WriteName(formatted, arrayChild, output);
     //It's either formatted or fetched
-    switch (type()){
+    switch (_type){
 	   case JSON_NODE:   //got members, write the members
 		  Fetch();
-            return WriteComment(indent) + WriteName(formatted, arrayChild) + JSON_TEXT("{") + WriteChildren(indent) + JSON_TEXT("}");
+            output += JSON_TEXT("{");
+			WriteChildren(indent, output);
+			output += JSON_TEXT("}");
+			return;
 	   case JSON_ARRAY:	   //write out the child nodes int he array
 		  Fetch();
+		  output += JSON_TEXT("[");
 		  #ifdef JSON_ARRAY_SIZE_ON_ONE_LINE
 			 if (size() <= JSON_ARRAY_SIZE_ON_ONE_LINE){
-				return WriteComment(indent) + WriteName(formatted, arrayChild) + JSON_TEXT("[") + WriteChildrenOneLine(indent) + JSON_TEXT("]");
+				 WriteChildrenOneLine(indent, output);
+			 } else {
+		  #endif
+				 WriteChildren(indent, output);
+		  #ifdef JSON_ARRAY_SIZE_ON_ONE_LINE
 			 }
 		  #endif
-            return WriteComment(indent) + WriteName(formatted, arrayChild) + JSON_TEXT("[") + WriteChildren(indent) + JSON_TEXT("]");
+            output += JSON_TEXT("]");
+			return;
 	   case JSON_NUMBER:   //write out a literal, without quotes
 	   case JSON_NULL:
 	   case JSON_BOOL:
-            return WriteComment(indent) + WriteName(formatted, arrayChild) + _string;
+            output.append(_string.begin(), _string.end());
+			return;
     }
 
-    JSON_ASSERT_SAFE(type() == JSON_STRING, JSON_TEXT("Writing an unknown JSON node type"), return JSON_TEXT(""););
+	JSON_ASSERT(_type == JSON_STRING, JSON_TEXT("Unknown json node type"));
     //If it go here, then it's a json_string
     #if !defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY)
-	   if (json_likely(fetched)) return WriteComment(indent) + WriteName(formatted, arrayChild) + JSON_TEXT("\"") + JSONWorker::UnfixString(_string, _string_encoded) + JSON_TEXT("\"");  //It's already been fetched, meaning that it's unescaped
-	   return WriteComment(indent) + WriteName(formatted, arrayChild) + _string;  //it hasn't yet been fetched, so it's already unescaped, just do a dump
-    #else
-	   return WriteComment(indent) + WriteName(formatted, arrayChild) + JSON_TEXT("\"") + JSONWorker::UnfixString(_string, _string_encoded) + JSON_TEXT("\"");
+		if (json_likely(fetched)){
+	#endif
+			output += JSON_TEXT("\"");
+			JSONWorker::UnfixString(_string, _string_encoded, output);  //It's already been fetched, meaning that it's unescaped
+			output += JSON_TEXT("\"");  
+	#if !defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY)
+		} else {
+			DumpRawString(output);  //it hasn't yet been fetched, so it's already unescaped, just do a dump
+		}
     #endif
 }
 #endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSON_Base64.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/JSON_Base64.h Changed

@@ -1,17 +1,35 @@
-#ifndef JSON_BASE64_H
-#define JSON_BASE64_H
+#ifndef LIBJSON_GUARD_BASE64_H
+#define LIBJSON_GUARD_BASE64_H
 
 #include "JSONDebug.h"
 #if defined(JSON_BINARY) || defined(JSON_EXPOSE_BASE64)  //if this is not needed, don't waste space compiling it
 
-#include <string>
-
+#include "../Dependencies/libbase64++/libbase64++.h"
 
 class JSONBase64 {
 public:
-    static json_string json_encode64(const unsigned char * binary, size_t bytes) json_nothrow json_cold;
-    static std::string json_decode64(const json_string & encoded) json_nothrow json_cold;
+    inline static json_string json_encode64(const unsigned char * binary, size_t bytes) json_nothrow json_cold;
+    inline static std::string json_decode64(const json_string & encoded) json_nothrow json_cold;
+private: 
+    JSONBase64(void);
 };
 
+json_string JSONBase64::json_encode64(const unsigned char * binary, size_t bytes) json_nothrow {
+    #if defined JSON_DEBUG || defined JSON_SAFE
+        return libbase64::encode<json_string, json_char, json_uchar, true>(binary, bytes);
+    #else
+	    return libbase64::encode<json_string, json_char, json_uchar, false>(binary, bytes);
+    #endif
+}
+
+std::string JSONBase64::json_decode64(const json_string & encoded) json_nothrow {
+    #if defined JSON_DEBUG || defined JSON_SAFE
+        return libbase64::decode<json_string, json_char, json_uchar, true>(encoded);
+    #else
+    	return libbase64::decode<json_string, json_char, json_uchar, false>(encoded);
+    #endif
+}
+
+
 #endif
 #endif

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/License.txt Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/NumberToString.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/NumberToString.h Changed

@@ -1,10 +1,12 @@
 #ifndef NUMBERTOSTRING_H
 #define NUMBERTOSTRING_H
 
+#include <limits>
 #include "JSONDebug.h"
 #ifdef JSON_LESS_MEMORY
     #include "JSONMemory.h"
 #endif
+#include "JSONSharedString.h"
 #include <cstdio>
 #ifdef JSON_STRICT
     #include <cmath>
@@ -47,7 +49,7 @@
 class NumberToString {
 public:
     template<typename T>
-    static json_string _itoa(T val) json_nothrow {
+    static json_string _itoa(T val) json_nothrow {		
 	   #ifdef JSON_LESS_MEMORY
 		  json_auto<json_char> s(getLenSize<sizeof(T)>::GETLEN);
 	   #else
@@ -115,20 +117,40 @@
     #endif
 
     static json_string _ftoa(json_number value) json_nothrow {
-            json_char num_str_result[64];
-            snprintf(num_str_result, 63, "%f", value); // MEANX : dont cast to double, win32 does not like it
-           // MEANX Convert "," to "." if needed, "," is used as entry separator for json
-          for(json_char * pos = &num_str_result[0]; *pos; ++pos)
-                {
-                        if(*pos==',') {*pos='.'; break;}
-                }
-           // MEANX /Convert , to . if needed
+	   #ifndef JSON_LIBRARY
+			//ScopeCoverage(_ftoa_coverage, 6);
+		  if (json_unlikely(value >= 0.0 && _floatsAreEqual(value, (json_number)((unsigned EXTRA_LONG long)value)))){
+			 return _uitoa<unsigned EXTRA_LONG long>((unsigned EXTRA_LONG long)value);
+		  } else
+		#else
+			  //ScopeCoverage(_ftoa_coverage, 5);
+	   #endif
+		  if (json_unlikely(_floatsAreEqual(value, (json_number)((long EXTRA_LONG)value)))){
+			 return _itoa<long EXTRA_LONG>((long EXTRA_LONG)value);
+		  }
 
+	   #ifdef JSON_LESS_MEMORY
+		  json_auto<json_char> s(64);
+	   #else
+		  json_char num_str_result[64];
+	   #endif
+	   #ifdef JSON_UNICODE
+		  std::swprintf(num_str_result, 63, LFLOAT_STRING, (EXTRA_LONG double)value);
+	   #else
+		  //Thanks to Salvor Hardin for this Visual C++ fix
+		  #ifdef _MSC_VER
+			 _snprintf_s(num_str_result, 63, 63, FLOAT_STRING, (EXTRA_LONG double)value); //yes, 63 appears twice using _snprintf_s()
+		  #else
+			 snprintf(num_str_result, 63, FLOAT_STRING, (EXTRA_LONG double)value);
+		  #endif
+	   #endif
 	   //strip the trailing zeros
 	   for(json_char * pos = &num_str_result[0]; *pos; ++pos){
 		  if (json_unlikely(*pos == '.')){  //only care about after the decimal
 			 for(json_char * runner = pos + 1; *runner; ++runner){
-				if (json_likely(*runner != JSON_TEXT('0'))) pos = runner + 1;  //have to go to the end 1.0001
+				 if (json_likely(*runner != JSON_TEXT('0'))){
+					 pos = runner + 1;  //have to go to the end 1.0001
+				 }
 			 }
 			 *pos = JSON_TEXT('\0');
 			 break;
@@ -142,71 +164,110 @@
 		  const json_char * p = str.c_str();
 		  bool decimal = false;
 		  bool scientific = false;
+		   
+			#ifdef JSON_STRICT
+		   bool leadingzero = false;	   
+			#endif
 
 		  //first letter is weird
 		  switch(*p){
-			 case '\0':
+			 case JSON_TEXT('\0'):
 				return false;
 		  #ifndef JSON_STRICT
-			 case '.':
+			 case JSON_TEXT('.'):
 				decimal = true;
 				break;
-			 case '+':
+			 case JSON_TEXT('+'):
 		  #endif
-			 case '-':
-			 case '1':
-			 case '2':
-			 case '3':
-			 case '4':
-			 case '5':
-			 case '6':
-			 case '7':
-			 case '8':
-			 case '9':
+			 case JSON_TEXT('-'):
+				  switch (*(p + 1)){
+					  case JSON_TEXT('.'):
+					  case JSON_TEXT('e'):
+					  case JSON_TEXT('E'):
+					  case JSON_TEXT('\0'):
+						  return false;
+					  case JSON_TEXT('0'):
+						  #ifdef JSON_STRICT
+						  switch(*(p + 2)){
+							  case JSON_TEXT('.'):
+							  case JSON_TEXT('e'):
+							  case JSON_TEXT('E'):
+								  leadingzero = false;
+								  break;
+							  case JSON_TEXT('\0'): 
+								  return true;
+							  default:
+								  leadingzero = true;
+								  break;
+						  }
+						  #endif
+						  ++p;
+						  break;
+					  default:
+						  break;
+				  }
+				  break;
+			 case JSON_TEXT('1'):
+			 case JSON_TEXT('2'):
+			 case JSON_TEXT('3'):
+			 case JSON_TEXT('4'):
+			 case JSON_TEXT('5'):
+			 case JSON_TEXT('6'):
+			 case JSON_TEXT('7'):
+			 case JSON_TEXT('8'):
+			 case JSON_TEXT('9'):
 				break;
-			 case '0':
+			 case JSON_TEXT('0'):
 				++p;
+				#ifdef JSON_STRICT
+				leadingzero = true;	   
+				#endif
 				switch(*p){
-				    case '.':
+				    case JSON_TEXT('.'):
 					   decimal = true;
 					   break;
-				    case 'e':
-				    case 'E':
+				    case JSON_TEXT('e'):
+				    case JSON_TEXT('E'):
+						#ifdef JSON_STRICT
+						leadingzero = false; //not leading, just a zero
+						#endif
 					   scientific = true;
 					   ++p;
 					   switch(*p){
-						  case '\0':
+						  case JSON_TEXT('\0'):
 							 return false;
-						  case '-':
-						  case '+':
-						  case '0':
-						  case '1':
-						  case '2':
-						  case '3':
-						  case '4':
-						  case '5':
-						  case '6':
-						  case '7':
-						  case '8':
-						  case '9':
+						  case JSON_TEXT('-'):
+						  case JSON_TEXT('+'):
+						  #ifndef JSON_STRICT
+						  case JSON_TEXT('0'):  //cant have a leading zero in scrict
+						  #endif
+						  case JSON_TEXT('1'):
+						  case JSON_TEXT('2'):
+						  case JSON_TEXT('3'):
+						  case JSON_TEXT('4'):
+						  case JSON_TEXT('5'):
+						  case JSON_TEXT('6'):
+						  case JSON_TEXT('7'):
+						  case JSON_TEXT('8'):
+						  case JSON_TEXT('9'):
 							 break;
 						  default:
 							 return false;
 					   }
 					   break;
 				    #ifndef JSON_STRICT
-					   case 'x':
+					   case JSON_TEXT('x'):
 						  return (str.find_first_not_of(JSON_TEXT("0123456789ABCDEFabcdef"), 2) == json_string::npos);
-					   case '1':
-					   case '2':
-					   case '3':
-					   case '4':
-					   case '5':
-					   case '6':
-					   case '7':
+					   case JSON_TEXT('1'):
+					   case JSON_TEXT('2'):
+					   case JSON_TEXT('3'):
+					   case JSON_TEXT('4'):
+					   case JSON_TEXT('5'):
+					   case JSON_TEXT('6'):
+					   case JSON_TEXT('7'):
 						  return (str.find_first_not_of(JSON_TEXT("01234567"), 1) == json_string::npos);
 				    #endif
-				    case '\0':  //just 0
+				    case JSON_TEXT('\0'):  //just 0
 					   return true;
 				    default:
 					   return false;
@@ -220,88 +281,142 @@
 		  //next digits
 		  while (*p){
 			 switch(*p){
-				case '.':
-				    if (json_unlikely(decimal)) return false; //multiple decimals
-				    if (json_unlikely(scientific)) return false;
+				case JSON_TEXT('.'):
+					 if (json_unlikely(decimal)){
+						 return false; //multiple decimals
+					 }
+					 
+					 if (json_unlikely(scientific)){
+						 return false;
+					 }
 				    decimal = true;
 				    break;
-				case 'e':
-				case 'E':
-				    if (json_unlikely(scientific)) return false;
+				case JSON_TEXT('e'):
+				case JSON_TEXT('E'):
+					 if (json_unlikely(scientific)){
+						 return false;
+					 }
 				    scientific = true;
 				    ++p;
 				    switch(*p){
-					   case '\0':
+					   case JSON_TEXT('\0'):
 						  return false;
-					   case '-':
-					   case '+':
-					   case '0':
-					   case '1':
-					   case '2':
-					   case '3':
-					   case '4':
-					   case '5':
-					   case '6':
-					   case '7':
-					   case '8':
-					   case '9':
+					   case JSON_TEXT('-'):
+					   case JSON_TEXT('+'):
+							if (!isdigit(*(p + 1))){
+								return false;
+							}
+							
+							#ifdef JSON_STRICT
+								if (*(p + 1) == JSON_TEXT('0')){  //no leading zeros on scientific notations
+									return false;
+								}
+							#endif
+							break;
+						#ifndef JSON_STRICT
+					   case JSON_TEXT('0'):  //cant have a leading zero in scrict
+						#endif
+					   case JSON_TEXT('1'):
+					   case JSON_TEXT('2'):
+					   case JSON_TEXT('3'):
+					   case JSON_TEXT('4'):
+					   case JSON_TEXT('5'):
+					   case JSON_TEXT('6'):
+					   case JSON_TEXT('7'):
+					   case JSON_TEXT('8'):
+					   case JSON_TEXT('9'):
 						  break;
 					   default:
 						  return false;
 				    }
 				    break;
-				case '0':
-				case '1':
-				case '2':
-				case '3':
-				case '4':
-				case '5':
-				case '6':
-				case '7':
-				case '8':
-				case '9':
+				case JSON_TEXT('0'):
+				case JSON_TEXT('1'):
+				case JSON_TEXT('2'):
+				case JSON_TEXT('3'):
+				case JSON_TEXT('4'):
+				case JSON_TEXT('5'):
+				case JSON_TEXT('6'):
+				case JSON_TEXT('7'):
+				case JSON_TEXT('8'):
+				case JSON_TEXT('9'):
 				    break;
 				default:
 				    return false;
 			 }
 			 ++p;
 		  }
+		#ifdef JSON_STRICT
+		   if (leadingzero && !decimal){
+			   return false;	  
+		   }
+		#endif
 		  return true;
 	   }
     #endif
 
     #ifdef JSON_STRICT
 	   //much faster because no octal or hex support
-	   json_number _atof (json_char * num){
+	   static json_number _atof (const json_char * num){
 		  json_number sign = (json_number)1.0;
 
 		  //sign
 		  if (*num==JSON_TEXT('-')){
 			 sign = -1.0;
 			 ++num;
+		  } else {
 		  }
 
-		  //skip leading zeros
-		  while (*num == JSON_TEXT('0')){
+		  //skip leading zero if one
+		  #if defined(JSON_SAFE) || defined(JSON_DEBUG)
+			 bool _leadingzeros = *num == JSON_TEXT('0');
+		     bool _leadingdigits = false;
+		  #endif
+		  if (*num == JSON_TEXT('0')){
 			 ++num;
 		  }
+		  #ifdef JSON_STRICT
+			else if (json_likely(*num < JSON_TEXT('1') || *num > JSON_TEXT('9'))){
+				return std::numeric_limits<json_number>::signaling_NaN();
+			}
+		  #endif
+		   
+		   JSON_ASSERT_SAFE(*num != JSON_TEXT('0'), JSON_TEXT("multiple leading zeros"), return std::numeric_limits<json_number>::signaling_NaN(); );
 
 		  // Number
-		  json_number n = (json_number)0.0
+		   json_number n = (json_number)0.0;
 		  if (json_likely(*num >= JSON_TEXT('1') && *num <= JSON_TEXT('9'))){
+			  #if defined(JSON_SAFE) || defined(JSON_DEBUG)
+				  _leadingdigits = true;
+			  #endif
 			 do {
 				n = (n * 10.0) + (*num++ - JSON_TEXT('0'));
 			 } while (*num >= JSON_TEXT('0') && *num <= JSON_TEXT('9'));
+		  } else {
+			  JSON_ASSERT_SAFE(
+							   (*num) == JSON_TEXT('.') ||	 //.xxx
+							   (*num) == JSON_TEXT('e') ||	 //0Exxx
+							   (*num) == JSON_TEXT('E') ||	 //0exxx
+							   (*num) == JSON_TEXT('\0')     //end of the number, just zero
+							   , JSON_TEXT("first digit not a number, e, period, or terminator"), return std::numeric_limits<json_number>::signaling_NaN(); );
 		  }
 
 		  // Fractional part
 		  json_number scale = (json_number)0.0;
-		  if (*num==JSON_TEXT('.')) {
+		  if (*num == JSON_TEXT('.')) {
+			  JSON_ASSERT_SAFE(_leadingzeros || _leadingdigits, JSON_TEXT("period without leading anything"), return std::numeric_limits<json_number>::signaling_NaN(); );
 			 ++num;
-			 do {
+			  for(; *num >= JSON_TEXT('0') && *num <= JSON_TEXT('9');){
 				n = (n * 10.0) + (*num++ - JSON_TEXT('0'));
 				--scale;
-			 } while (*num>=JSON_TEXT('0') && *num<=JSON_TEXT('9'));
+			  };
+		  } else {  
+			  JSON_ASSERT_SAFE(!_leadingzeros || n == 0, JSON_TEXT("leading zero on an int"), return std::numeric_limits<json_number>::signaling_NaN(); );
+			  JSON_ASSERT_SAFE(
+							   (*num) == JSON_TEXT('e') ||	 //0Exxx
+							   (*num) == JSON_TEXT('E') ||	 //0exxx
+							   (*num) == JSON_TEXT('\0')     //end of the number, just zero
+							   , JSON_TEXT("next char not an e or terminator"), return std::numeric_limits<json_number>::signaling_NaN(); );
 		  }
 
 		  // Exponent
@@ -315,14 +430,19 @@
 				case JSON_TEXT('-'):
 				    signsubscale = -1;
 				    ++num;
+					 JSON_ASSERT_SAFE(*num != JSON_TEXT('0'), JSON_TEXT("negative cant be followed by leading zero even after E"), return std::numeric_limits<json_number>::signaling_NaN(); );
 				    break;
+				 default:
+					 break;
 			 }
+			 JSON_ASSERT_SAFE(*num != JSON_TEXT('\0'), JSON_TEXT("no exponent for scientific notation"), return std::numeric_limits<json_number>::signaling_NaN(); );
 			 while (*num >= JSON_TEXT('0') && *num <= JSON_TEXT('9')){
 				subscale=(subscale * 10) + (*num++ - JSON_TEXT('0'));
 			 }
 		  }
-
-		  return sign * n * pow(10.0, scale + subscale * signsubscale);	// number = +/- number.fraction * 10^+/- exponent
+		   
+		  JSON_ASSERT_SAFE(*num == JSON_TEXT('\0'), JSON_TEXT("done with number, not at terminator"), return std::numeric_limits<json_number>::signaling_NaN(); );
+		  return sign * n * pow((json_number)10.0, scale + subscale * signsubscale);	// number = +/- number.fraction * 10^+/- exponent
 	   }
     #endif
 };

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/admPackage.txt Added

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.cpp Changed

@@ -2,21 +2,7 @@
 #include "NumberToString.h"  //So that I can convert numbers into strings
 #include "JSONNode.h"  //To fill in the foreward declaration
 #include "JSONWorker.h"  //For fetching and parsing and such
-
-/*
-    The point of these constants is for faster assigning, if I
-    were to constantly assign to a string literal, there would be
-    lots of copies, but since strings are copy on write, this assignment
-    is much faster
-*/
-static const json_string CONST_TRUE(JSON_TEXT("true"));
-static const json_string CONST_FALSE(JSON_TEXT("false"));
-static const json_string CONST_NULL(JSON_TEXT("null"));
-
-#ifdef JSON_UNIT_TEST
-    void internalJSONNode::incinternalAllocCount(void) json_nothrow { JSONNode::incinternalAllocCount(); }
-    void internalJSONNode::decinternalAllocCount(void) json_nothrow { JSONNode::decinternalAllocCount(); }
-#endif
+#include "JSONGlobals.h"
 
 internalJSONNode::internalJSONNode(const internalJSONNode & orig) json_nothrow :
     _type(orig._type), _name(orig._name), _name_encoded(orig._name_encoded),
@@ -28,7 +14,7 @@
     initializeChildren(0){
 
 
-    incinternalAllocCount();
+    LIBJSON_COPY_CTOR;
     if (isContainer()){
 	   CHILDREN = jsonChildren::newChildren();
 	   if (json_likely(!orig.CHILDREN -> empty())){
@@ -38,27 +24,27 @@
 		  }
 	   }
     }
-    #ifdef JSON_MUTEX_CALLBACKS
+    #ifdef JSON_MUTEX_CALLBACKS /*-> JSON_MUTEX_CALLBACKS */
 	   _set_mutex(orig.mylock, false);
-    #endif
+    #endif /*<- */
 }
 
-#ifdef JSON_PREPARSE
+#ifdef JSON_PREPARSE /*-> JSON_PREPARSE */
     #define SetFetchedFalseOrDo(code) code
-#else
+#else /*<- else */
     #define SetFetchedFalseOrDo(code) SetFetched(false)
-#endif
+#endif /*<- */
 
 //this one is specialized because the root can only be array or node
-#ifdef JSON_READ_PRIORITY
+#ifdef JSON_READ_PRIORITY /*-> JSON_READ_PRIORITY */
 internalJSONNode::internalJSONNode(const json_string & unparsed) json_nothrow : _type(), _name(),_name_encoded(false), _string(unparsed), _string_encoded(), _value()
     initializeMutex(0)
     initializeRefCount(1)
     initializeFetch(false)
-    initializeComment(EMPTY_JSON_STRING)
+    initializeComment(json_global(EMPTY_JSON_STRING))
     initializeChildren(0){
 
-    incinternalAllocCount();
+    LIBJSON_CTOR;
     switch (unparsed[0]){
 	   case JSON_TEXT('{'):  //node
 		  _type = JSON_NODE;
@@ -80,7 +66,7 @@
     }
 }
 
-#ifndef JSON_STRICT
+#ifndef JSON_STRICT 
     #define LETTERCASE(x, y)\
 	   case JSON_TEXT(x):\
 	   case JSON_TEXT(y)
@@ -93,14 +79,14 @@
     initializeMutex(0)
     initializeRefCount(1)
     initializeFetch(false)
-    initializeComment(EMPTY_JSON_STRING)
+    initializeComment(json_global(EMPTY_JSON_STRING))
     initializeChildren(0){
 
-    incinternalAllocCount();
+    LIBJSON_CTOR;
 
     #ifdef JSON_STRICT
-	   JSON_ASSERT_SAFE(!value_t.empty(), JSON_TEXT("empty node"), Nullify(NOTVALID); return;);
-    #else
+	   JSON_ASSERT_SAFE(!value_t.empty(), JSON_TEXT("empty node"), Nullify(); return;);
+    #else 
 	   if (json_unlikely(value_t.empty())){
 		  _type = JSON_NULL;
 		  SetFetched(true);
@@ -109,9 +95,6 @@
     #endif
 
     _string = value_t;
-    #ifdef JSON_LESS_MEMORY
-	   JSON_ASSERT(_string.capacity() == _string.length(), JSON_TEXT("_string object too large"));
-    #endif
 
     const json_char firstchar = value_t[0];
     #if defined JSON_DEBUG || defined JSON_SAFE
@@ -122,52 +105,53 @@
         case JSON_TEXT('\"'):  //a json_string literal, still escaped and with leading and trailing quotes
             JSON_ASSERT_SAFE(lastchar == JSON_TEXT('\"'), JSON_TEXT("Unterminated quote"), Nullify(); return;);
             _type = JSON_STRING;
-		  SetFetchedFalseOrDo(FetchString());
+			SetFetchedFalseOrDo(FetchString());
             break;
         case JSON_TEXT('{'):  //a child node, or set of children
             JSON_ASSERT_SAFE(lastchar == JSON_TEXT('}'), JSON_TEXT("Missing }"), Nullify(); return;);
             _type = JSON_NODE;
-		  CHILDREN = jsonChildren::newChildren();
-		  SetFetchedFalseOrDo(FetchNode());
+			CHILDREN = jsonChildren::newChildren();
+			SetFetchedFalseOrDo(FetchNode());
             break;
         case JSON_TEXT('['):  //an array
             JSON_ASSERT_SAFE(lastchar == JSON_TEXT(']'), JSON_TEXT("Missing ]"), Nullify(); return;);
             _type = JSON_ARRAY;
-		  CHILDREN = jsonChildren::newChildren();
-		  SetFetchedFalseOrDo(FetchArray());
+			CHILDREN = jsonChildren::newChildren();
+			SetFetchedFalseOrDo(FetchArray());
             break;
         LETTERCASE('t', 'T'):
-            JSON_ASSERT_SAFE(value_t == JSON_TEXT("true"), json_string(json_string(JSON_TEXT("unknown JSON literal: ")) + value_t).c_str(), Nullify(); return;);
+            JSON_ASSERT_SAFE(value_t == json_global(CONST_TRUE), json_string(json_global(ERROR_UNKNOWN_LITERAL) + value_t).c_str(), Nullify(); return;);
             _value._bool = true;
             _type = JSON_BOOL;
-		  SetFetched(true);
+			SetFetched(true);
             break;
         LETTERCASE('f', 'F'):
-            JSON_ASSERT_SAFE(value_t == JSON_TEXT("false"), json_string(json_string(JSON_TEXT("unknown JSON literal: ")) + value_t).c_str(), Nullify(); return;);
+            JSON_ASSERT_SAFE(value_t == json_global(CONST_FALSE), json_string(json_global(ERROR_UNKNOWN_LITERAL) + value_t).c_str(), Nullify(); return;);
             _value._bool = false;
             _type = JSON_BOOL;
-		  SetFetched(true);
+			SetFetched(true);
             break;
         LETTERCASE('n', 'N'):
-            JSON_ASSERT_SAFE(value_t == JSON_TEXT("null"), json_string(json_string(JSON_TEXT("unknown JSON literal: ")) + value_t).c_str(), Nullify(); return;);
+            JSON_ASSERT_SAFE(value_t == json_global(CONST_NULL), json_string(json_global(ERROR_UNKNOWN_LITERAL) + value_t).c_str(), Nullify(); return;);
             _type = JSON_NULL;
-		  SetFetched(true);
+			SetFetched(true);
             break;
         default:
-            JSON_ASSERT_SAFE(NumberToString::isNumeric(value_t), json_string(json_string(JSON_TEXT("unknown JSON literal: ")) + value_t).c_str(), Nullify(); return;);
-		  _type = JSON_NUMBER;
-		  SetFetchedFalseOrDo(FetchNumber());
+            JSON_ASSERT_SAFE(NumberToString::isNumeric(value_t), json_string(json_global(ERROR_UNKNOWN_LITERAL) + value_t).c_str(), Nullify(); return;);
+			_type = JSON_NUMBER;
+			SetFetchedFalseOrDo(FetchNumber());
             break;
     }
 }
-#endif
+
+#endif /*<- */
 
 
 internalJSONNode::~internalJSONNode(void) json_nothrow {
-    decinternalAllocCount();
-    #ifdef JSON_MUTEX_CALLBACKS
+    LIBJSON_DTOR;
+    #ifdef JSON_MUTEX_CALLBACKS 
 	   _unset_mutex();
-    #endif
+    #endif /*<- */
     DELETE_CHILDREN();
 }
 
@@ -179,7 +163,7 @@
 	   _string = JSONWorker::FixString(json_string(_string.begin() + 1, _string.end() - 1), STRING_ENCODED);
 	   #ifdef JSON_LESS_MEMORY
 		  JSON_ASSERT(_string.capacity() == _string.length(), JSON_TEXT("_string object too large 2"));
-	   #endif
+	   #endif 
     }
 
     void internalJSONNode::FetchNode(void) const json_nothrow {
@@ -203,11 +187,11 @@
 //This one is used by as_int and as_float, so even non-readers need it
 void internalJSONNode::FetchNumber(void) const json_nothrow {
     #ifdef JSON_STRICT
-	   _value._number = NumberToString::_atof(_string.c_str())
-    #else
+		_value._number = NumberToString::_atof(_string.c_str());
+    #else 
 	   #ifdef JSON_UNICODE
 		  const size_t len = _string.length();
-		  #if defined(_MSC_VER) && defined(JSON_SAFE)
+		  #if defined(_MSC_VER) && defined(JSON_SAFE) 
 			 const size_t bytes = (len * (sizeof(json_char) / sizeof(char))) + 1;
 			 json_auto<char> temp(bytes);
 			 size_t res;
@@ -219,21 +203,24 @@
 		  #elif defined(JSON_SAFE)
 			 const size_t bytes = (len * (sizeof(json_char) / sizeof(char))) + 1;
 			 json_auto<char> temp(bytes);
-			 size_t res = wcstombs(temp.ptr, _string.c_str(), len);
-			 if (res == -1){
+			 size_t res = std::wcstombs(temp.ptr, _string.c_str(), len);
+			 if (res == (size_t)-1){
 				_value._number = (json_number)0.0;
 				return;
 			 }
-		  #else
+		  #else 
 			 json_auto<char> temp(len + 1);
-			 size_t res = wcstombs(temp.ptr, _string.c_str(), len);
-		  #endif
+			 size_t res = std::wcstombs(temp.ptr, _string.c_str(), len);
+		  #endif 
 		  temp.ptr[res] = '\0';
-		  _value._number = (json_number)atof(temp.ptr);
+		  _value._number = (json_number)std::atof(temp.ptr);
 	   #else
-		  _value._number = (json_number)atof(_string.c_str());
+		  _value._number = (json_number)std::atof(_string.c_str());
 	   #endif
     #endif
+    #if((!defined(JSON_CASTABLE) && defined(JSON_LESS_MEMORY)) && !defined(JSON_WRITE_PRIORITY))
+	   clearString(_string);
+    #endif
 }
 
 #if !defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY)
@@ -256,7 +243,7 @@
 			 default:
 				JSON_FAIL(JSON_TEXT("Fetching an unknown type"));
 				Nullify();
-		  #endif
+		  #endif 
 	   }
 	   fetched = true;
     }
@@ -265,7 +252,8 @@
 void internalJSONNode::Set(const json_string & val) json_nothrow {
     makeNotContainer();
     _type = JSON_STRING;
-    _string = shrinkString(val);
+    _string = val;
+	shrinkString(_string);
     _string_encoded = true;
     SetFetched(true);
 }
@@ -275,7 +263,11 @@
 	   makeNotContainer();
 	   _type = JSON_NUMBER;
 	   _value._number = (json_number)val;
-	   _string = NumberToString::_itoa<json_int_t>(val);
+	   #if(defined(JSON_CASTABLE) || !defined(JSON_LESS_MEMORY) || defined(JSON_WRITE_PRIORITY))
+		  _string = NumberToString::_itoa<json_int_t>(val);
+	   #else
+		  clearString(_string);
+	   #endif
 	   SetFetched(true);
     }
 
@@ -283,33 +275,56 @@
 	   makeNotContainer();
 	   _type = JSON_NUMBER;
 	   _value._number = val;
-	   _string = NumberToString::_ftoa(val);
+	   #if(defined(JSON_CASTABLE) || !defined(JSON_LESS_MEMORY) || defined(JSON_WRITE_PRIORITY))
+		  _string = NumberToString::_ftoa(val);
+	   #else 
+		  clearString(_string);
+	   #endif
 	   SetFetched(true);
     }
-#else
-    #define SET(converter, type)\
-	   void internalJSONNode::Set(type val) json_nothrow {\
-		  makeNotContainer();\
-		  _type = JSON_NUMBER;\
-		  _value._number = (json_number)val;\
-		  _string = NumberToString::converter<type>(val);\
-		  SetFetched(true);\
-	   }
+#else 
+    #if(defined(JSON_CASTABLE) || !defined(JSON_LESS_MEMORY) || defined(JSON_WRITE_PRIORITY))
+	   #define SET(converter, type)\
+		  void internalJSONNode::Set(type val) json_nothrow {\
+			 makeNotContainer();\
+			 _type = JSON_NUMBER;\
+			 _value._number = (json_number)val;\
+			 _string = NumberToString::converter<type>(val);\
+			 SetFetched(true);\
+		  }
+	   #define SET_FLOAT(type) \
+		  void internalJSONNode::Set(type val) json_nothrow {\
+			 makeNotContainer();\
+			 _type = JSON_NUMBER;\
+			 _value._number = (json_number)val;\
+			 _string = NumberToString::_ftoa(_value._number);\
+			 SetFetched(true);\
+		  }
+    #else /*<- else */
+	   #define SET(converter, type)\
+		  void internalJSONNode::Set(type val) json_nothrow {\
+			 makeNotContainer();\
+			 _type = JSON_NUMBER;\
+			 _value._number = (json_number)val;\
+			 clearString(_string);\
+			 SetFetched(true);\
+		  }
+	   #define SET_FLOAT(type) \
+		  void internalJSONNode::Set(type val) json_nothrow {\
+			 makeNotContainer();\
+			 _type = JSON_NUMBER;\
+			 _value._number = (json_number)val;\
+			 clearString(_string);\
+			 SetFetched(true);\
+		  }
+    #endif
     #define SET_INTEGER(type) SET(_itoa, type) SET(_uitoa, unsigned type)
-    #define SET_FLOAT(type) \
-	   void internalJSONNode::Set(type val) json_nothrow {\
-		  makeNotContainer();\
-		  _type = JSON_NUMBER;\
-		  _value._number = (json_number)val;\
-		  _string = NumberToString::_ftoa(_value._number);\
-		  SetFetched(true);\
-	   }
 
     SET_INTEGER(char)
     SET_INTEGER(short)
     SET_INTEGER(int)
     SET_INTEGER(long)
-    #ifndef JSON_ISO_STRICT
+    #ifndef JSON_ISO_STRICT 
 	   SET_INTEGER(long long)
 	   SET_FLOAT(long double)
     #endif
@@ -322,7 +337,9 @@
     makeNotContainer();
     _type = JSON_BOOL;
     _value._bool = val;
-    _string = val ? CONST_TRUE : CONST_FALSE;
+    #if(defined(JSON_CASTABLE) || !defined(JSON_LESS_MEMORY) || defined(JSON_WRITE_PRIORITY))
+	   _string = val ? json_global(CONST_TRUE) : json_global(CONST_FALSE);
+    #endif
     SetFetched(true);
 }
 
@@ -331,10 +348,10 @@
     if (type() != val -> type()) return false;	 //aren't even same type
     if (_name != val -> _name) return false;  //names aren't the same
     if (type() == JSON_NULL) return true;  //both null, can't be different
-    #if !defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY)
+    #if !defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY) 
 	   Fetch();
 	   val -> Fetch();
-    #endif
+    #endif 
     switch (type()){
 	   case JSON_STRING:
 		  return val -> _string == _string;
@@ -350,50 +367,54 @@
     //make sure each children is the same
     JSONNode ** valrunner = val -> CHILDREN -> begin();
     json_foreach(CHILDREN, myrunner){
-        JSON_ASSERT(*myrunner != NULL, JSON_TEXT("a null pointer within the children"));
-	   JSON_ASSERT(*valrunner != NULL, JSON_TEXT("a null pointer within the children"));
-	   JSON_ASSERT(valrunner != val -> CHILDREN -> end(), JSON_TEXT("at the end of other one's children, but they're the same size?"));
+        JSON_ASSERT(*myrunner != NULL, json_global(ERROR_NULL_IN_CHILDREN));
+		JSON_ASSERT(*valrunner != NULL, json_global(ERROR_NULL_IN_CHILDREN));
+		JSON_ASSERT(valrunner != val -> CHILDREN -> end(), JSON_TEXT("at the end of other one's children, but they're the same size?"));
         if (**myrunner != **valrunner) return false;
-	   ++valrunner;
+		++valrunner;
     }
     return true;
 }
 
 void internalJSONNode::Nullify(void) const json_nothrow {
     _type = JSON_NULL;
-    _string = CONST_NULL;
+    #if(defined(JSON_CASTABLE) || !defined(JSON_LESS_MEMORY) || defined(JSON_WRITE_PRIORITY)) /*-> JSON_CASTABLE || !JSON_LESS_MEMORY || JSON_WRITE_PRIORITY */
+	   _string = json_global(CONST_NULL);
+    #else /*<- else */
+	   clearString(_string);
+    #endif /*<- */
     SetFetched(true);
 }
 
-#ifdef JSON_MUTEX_CALLBACKS
+#ifdef JSON_MUTEX_CALLBACKS /*-> JSON_MUTEX_CALLBACKS */
     #define JSON_MUTEX_COPY ,mylock
-#else
+#else /*<- else */
     #define JSON_MUTEX_COPY
-#endif
+#endif /*<- */
 
-#ifdef JSON_LIBRARY
+#ifdef JSON_LIBRARY /*-> JSON_LIBRARY */
 void internalJSONNode::push_back(JSONNode * node) json_nothrow {
-#else
+#else /*<- else */
 void internalJSONNode::push_back(const JSONNode & node) json_nothrow {
-#endif
-    JSON_ASSERT_SAFE(isContainer(), JSON_TEXT("calling push_back on non-container type"), return;);
-    #ifdef JSON_LIBRARY
-	   #ifdef JSON_MUTEX_CALLBACKS
+#endif /*<- */
+    JSON_ASSERT_SAFE(isContainer(), json_global(ERROR_NON_CONTAINER) + JSON_TEXT("push_back"), return;);
+    #ifdef JSON_LIBRARY /*-> JSON_LIBRARY */
+	   #ifdef JSON_MUTEX_CALLBACKS /*-> JSON_MUTEX_CALLBACKS */
 		  if (mylock != 0) node -> set_mutex(mylock);
-	   #endif
+	   #endif /*<- */
 	   CHILDREN -> push_back(node);
-    #else
+    #else /*<- else */
 	   CHILDREN -> push_back(JSONNode::newJSONNode(node   JSON_MUTEX_COPY));
-    #endif
+    #endif /*<- */
 }
 
 void internalJSONNode::push_front(const JSONNode & node) json_nothrow {
-    JSON_ASSERT_SAFE(isContainer(), JSON_TEXT("calling at on non-container type"), return;);
+    JSON_ASSERT_SAFE(isContainer(), json_global(ERROR_NON_CONTAINER) + JSON_TEXT("push_front"), return;);
     CHILDREN -> push_front(JSONNode::newJSONNode(node   JSON_MUTEX_COPY));
 }
 
 JSONNode * internalJSONNode::pop_back(json_index_t pos) json_nothrow {
-    JSON_ASSERT_SAFE(isContainer(), JSON_TEXT("calling at on non-container type"), return 0;);
+    JSON_ASSERT_SAFE(isContainer(), json_global(ERROR_NON_CONTAINER) + JSON_TEXT("pop_back"), return 0;);
     JSONNode * result = (*CHILDREN)[pos];
     JSONNode ** temp = CHILDREN -> begin() + pos;
     CHILDREN -> erase(temp);
@@ -401,7 +422,7 @@
 }
 
 JSONNode * internalJSONNode::pop_back(const json_string & name_t) json_nothrow {
-    JSON_ASSERT_SAFE(isContainer(), JSON_TEXT("calling pop_back (named) on non-container type"), return 0;);
+    JSON_ASSERT_SAFE(isContainer(), json_global(ERROR_NON_CONTAINER) + JSON_TEXT("pop_back(str)"), return 0;);
     if (JSONNode ** res = at(name_t)){
 	   JSONNode * result = *res;
 	   CHILDREN -> erase(res);
@@ -410,9 +431,9 @@
     return 0;
 }
 
-#ifdef JSON_CASE_INSENSITIVE_FUNCTIONS
+#ifdef JSON_CASE_INSENSITIVE_FUNCTIONS /*-> JSON_CASE_INSENSITIVE_FUNCTIONS */
     JSONNode * internalJSONNode::pop_back_nocase(const json_string & name_t) json_nothrow {
-	   JSON_ASSERT_SAFE(isContainer(), JSON_TEXT("calling pop_back_nocase on non-container type"), return 0;);
+	   JSON_ASSERT_SAFE(isContainer(), json_global(ERROR_NON_CONTAINER) + JSON_TEXT("pop_back_nocase"), return 0;);
 	   if (JSONNode ** res = at_nocase(name_t)){
 		  JSONNode * result = *res;
 		  CHILDREN -> erase(res);
@@ -420,19 +441,19 @@
 	   }
 	   return 0;
     }
-#endif
+#endif /*<- */
 
 JSONNode ** internalJSONNode::at(const json_string & name_t) json_nothrow {
-    JSON_ASSERT_SAFE(isContainer(), JSON_TEXT("calling at on non-container type"), return 0;);
+    JSON_ASSERT_SAFE(isContainer(), json_global(ERROR_NON_CONTAINER) + JSON_TEXT("at"), return 0;);
     Fetch();
     json_foreach(CHILDREN, myrunner){
-	   JSON_ASSERT(*myrunner != NULL, JSON_TEXT("a null pointer within the children"));
+	   JSON_ASSERT(*myrunner != NULL, json_global(ERROR_NULL_IN_CHILDREN));
 	   if (json_unlikely((*myrunner) -> name() == name_t)) return myrunner;
     }
     return 0;
 }
 
-#ifdef JSON_CASE_INSENSITIVE_FUNCTIONS
+#ifdef JSON_CASE_INSENSITIVE_FUNCTIONS /*-> JSON_CASE_INSENSITIVE_FUNCTIONS */
     bool internalJSONNode::AreEqualNoCase(const json_char * ch_one, const json_char * ch_two) json_nothrow {
 	   while (*ch_one){  //only need to check one, if the other one terminates early, the check will cause it to fail
 		  const json_char c_one = *ch_one;
@@ -454,17 +475,17 @@
     }
 
     JSONNode ** internalJSONNode::at_nocase(const json_string & name_t) json_nothrow {
-	   JSON_ASSERT_SAFE(isContainer(), JSON_TEXT("calling at_nocase on non-container type"), return 0;);
+	   JSON_ASSERT_SAFE(isContainer(), json_global(ERROR_NON_CONTAINER) + JSON_TEXT("at_nocase"), return 0;);
 	   Fetch();
 	   json_foreach(CHILDREN, myrunner){
-		  JSON_ASSERT(*myrunner, JSON_TEXT("a null pointer within the children"));
+		  JSON_ASSERT(*myrunner, json_global(ERROR_NULL_IN_CHILDREN));
 		  if (json_unlikely(AreEqualNoCase((*myrunner) -> name().c_str(), name_t.c_str()))) return myrunner;
 	   }
 	   return 0;
     }
-#endif
+#endif /*<- */
 
-#if !defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY)
+#if !defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY) /*-> JSON_PREPARSE && JSON_READ_PRIORITY */
     void internalJSONNode::preparse(void) json_nothrow {
 	   Fetch();
 	   if (isContainer()){
@@ -473,155 +494,235 @@
 		  }
 	   }
     }
-#endif
+#endif /*<- */
 
 internalJSONNode::operator bool() const json_nothrow {
     Fetch();
-    switch(type()){
-	   case JSON_NUMBER:
-		  return !_floatsAreEqual(_value._number, (json_number)0.0);
-	   case JSON_NULL:
-		  return false;
-    }
-    JSON_ASSERT(type() == JSON_BOOL, JSON_TEXT("(bool) returning undefined results"));
+    #ifdef JSON_CASTABLE /*-> JSON_CASTABLE */
+	   switch(type()){
+		  case JSON_NUMBER:
+			 return !_floatsAreEqual(_value._number, (json_number)0.0);
+		  case JSON_NULL:
+			 return false;
+	   }
+    #endif /*<- */
+    JSON_ASSERT(type() == JSON_BOOL, json_global(ERROR_UNDEFINED) + JSON_TEXT("(bool)"));
     return _value._bool;
 }
 
-#ifdef JSON_LIBRARY
+#ifdef JSON_LIBRARY /*-> JSON_LIBRARY */
     internalJSONNode::operator json_number() const json_nothrow {
 	   Fetch();
-	   switch(type()){
-		  case JSON_NULL:
-			 return (json_number)0.0;
-		  case JSON_BOOL:
-			 return (json_number)(_value._bool ? 1.0 : 0.0);
-		  case JSON_STRING:
-			 FetchNumber();
-	   }
-	   JSON_ASSERT(type() == JSON_NUMBER, JSON_TEXT("as_float returning undefined results"));
+	   #ifdef JSON_CASTABLE /*-> JSON_CASTABLE */
+		  switch(type()){
+			 case JSON_NULL:
+				return (json_number)0.0;
+			 case JSON_BOOL:
+				return (json_number)(_value._bool ? 1.0 : 0.0);
+			 case JSON_STRING:
+				FetchNumber();
+		  }
+	   #endif /*<- */
+	   JSON_ASSERT(type() == JSON_NUMBER, json_global(ERROR_UNDEFINED) + JSON_TEXT("as_float"));
 	   return (json_number)_value._number;
     }
 
     internalJSONNode::operator json_int_t() const json_nothrow {
 	   Fetch();
-	   switch(type()){
-		  case JSON_NULL:
-			 return 0;
-		  case JSON_BOOL:
-			 return _value._bool ? 1 : 0;
-		  case JSON_STRING:
-			 FetchNumber();
-	   }
-	   JSON_ASSERT(type() == JSON_NUMBER, JSON_TEXT("as_int returning undefined results"));
-	   JSON_ASSERT(_value._number == (json_number)((json_int_t)_value._number), json_string(JSON_TEXT("as_int will truncate ")) + _string);
-	   return (json_int_t)_value._number;
-    }
-#else
-    #ifndef JSON_ISO_STRICT
-	   internalJSONNode::operator long double() const json_nothrow {
-		  Fetch();
+	   #ifdef JSON_CASTABLE /*-> JSON_CASTABLE */
 		  switch(type()){
 			 case JSON_NULL:
-				return (long double)0.0;
+				return 0;
 			 case JSON_BOOL:
-				return (long double)(_value._bool ? 1.0 : 0.0);
+				return _value._bool ? 1 : 0;
 			 case JSON_STRING:
 				FetchNumber();
 		  }
-		  JSON_ASSERT(type() == JSON_NUMBER, JSON_TEXT("float typecast returning undefined results"));
+	   #endif /*<- */
+	   JSON_ASSERT(type() == JSON_NUMBER, json_global(ERROR_UNDEFINED) + JSON_TEXT("as_int"));
+	   JSON_ASSERT(_value._number == (json_number)((json_int_t)_value._number), json_string(JSON_TEXT("as_int will truncate ")) + _string);
+	   return (json_int_t)_value._number;
+    }
+#else /*<- else */
+    #ifndef JSON_ISO_STRICT /*-> !JSON_ISO_STRICT */
+	   internalJSONNode::operator long double() const json_nothrow {
+		  Fetch();
+		  #ifdef JSON_CASTABLE /*-> JSON_CASTABLE */
+			 switch(type()){
+				case JSON_NULL:
+				    return (long double)0.0;
+				case JSON_BOOL:
+				    return (long double)(_value._bool ? 1.0 : 0.0);
+				case JSON_STRING:
+				    FetchNumber();
+			 }
+		  #endif /*<- */
+		  JSON_ASSERT(type() == JSON_NUMBER, json_global(ERROR_UNDEFINED) + JSON_TEXT("(long double)"));
 		  return (long double)_value._number;
 	   }
-    #else
+    #else /*<- else */
 	   internalJSONNode::operator double() const json_nothrow {
 		  Fetch();
-		  switch(type()){
-			 case JSON_NULL:
-				return (double)0.0;
-			 case JSON_BOOL:
-				return (double)(_value._bool ? 1.0 : 0.0);
-			 case JSON_STRING:
-				FetchNumber();
-		  }
-		  JSON_ASSERT(type() == JSON_NUMBER, JSON_TEXT("float typecast returning undefined results"));
+		  #ifdef JSON_CASTABLE /*-> JSON_CASTABLE */
+			 switch(type()){
+				case JSON_NULL:
+				    return (double)0.0;
+				case JSON_BOOL:
+				    return (double)(_value._bool ? 1.0 : 0.0);
+				case JSON_STRING:
+				    FetchNumber();
+			 }
+		  #endif /*<- */
+		  JSON_ASSERT(type() == JSON_NUMBER, json_global(ERROR_UNDEFINED) + JSON_TEXT("(double)"));
 		  return (double)_value._number;
 	   }
-    #endif
+    #endif /*<- */
 
     //do whichever one is longer, because it's easy to cast down
-    #ifdef JSON_ISO_STRICT
+    #ifdef JSON_ISO_STRICT /*-> JSON_ISO_STRICT */
 	   internalJSONNode::operator long() const json_nothrow
-    #else
+    #else /*<- else */
 	   internalJSONNode::operator long long() const json_nothrow
-    #endif
+    #endif /*<- */
     {
 	   Fetch();
-	   switch(type()){
-		  case JSON_NULL:
-			 return 0;
-		  case JSON_BOOL:
-			 return _value._bool ? 1 : 0;
-		  case JSON_STRING:
-			 FetchNumber();
-	   }
-	   JSON_ASSERT(type() == JSON_NUMBER, JSON_TEXT("as_int returning undefined results"));
-	   #ifdef JSON_ISO_STRICT
-		  JSON_ASSERT(_value._number > LONG_MIN, _string + JSON_TEXT(" is outside the lower range of long"));
-		  JSON_ASSERT(_value._number < LONG_MAX, _string + JSON_TEXT(" is outside the upper range of long"));
+	   #ifdef JSON_CASTABLE /*-> JSON_CASTABLE */
+		  switch(type()){
+			 case JSON_NULL:
+				return 0;
+			 case JSON_BOOL:
+				return _value._bool ? 1 : 0;
+			 case JSON_STRING:
+				FetchNumber();
+		  }
+	   #endif /*<- */
+	   #ifdef JSON_ISO_STRICT /*-> JSON_ISO_STRICT */
+		  JSON_ASSERT(type() == JSON_NUMBER, json_global(ERROR_UNDEFINED) + JSON_TEXT("(long)"));
+		  JSON_ASSERT(_value._number > LONG_MIN, _string + json_global(ERROR_LOWER_RANGE) + JSON_TEXT("long"));
+		  JSON_ASSERT(_value._number < LONG_MAX, _string + json_global(ERROR_UPPER_RANGE) + JSON_TEXT("long"));
 		  JSON_ASSERT(_value._number == (json_number)((long)_value._number), json_string(JSON_TEXT("(long) will truncate ")) + _string);
 		  return (long)_value._number;
-	   #else
+	   #else /*<- else */
+		  JSON_ASSERT(type() == JSON_NUMBER, json_global(ERROR_UNDEFINED) + JSON_TEXT("(long long)"));
 		  #ifdef LONG_LONG_MAX			 
-			 JSON_ASSERT(_value._number < LONG_LONG_MAX, _string + JSON_TEXT(" is outside the upper range of long long"));
+			 JSON_ASSERT(_value._number < LONG_LONG_MAX, _string + json_global(ERROR_UPPER_RANGE) + JSON_TEXT("long long"));
 		  #elif defined(LLONG_MAX)
-			 JSON_ASSERT(_value._number < LLONG_MAX, _string + JSON_TEXT(" is outside the upper range of long long"));
+			 JSON_ASSERT(_value._number < LLONG_MAX, _string + json_global(ERROR_UPPER_RANGE) + JSON_TEXT("long long"));
 		  #endif
 		  #ifdef LONG_LONG_MIN
-			 JSON_ASSERT(_value._number > LONG_LONG_MIN, _string + JSON_TEXT(" is outside the lower range of long long"));
+			 JSON_ASSERT(_value._number > LONG_LONG_MIN, _string + json_global(ERROR_LOWER_RANGE) + JSON_TEXT("long long"));
 		  #elif defined(LLONG_MAX)
-			 JSON_ASSERT(_value._number > LLONG_MIN, _string + JSON_TEXT(" is outside the lower range of long long"));
+			 JSON_ASSERT(_value._number > LLONG_MIN, _string + json_global(ERROR_LOWER_RANGE) + JSON_TEXT("long long"));
 		  #endif
 
 		  JSON_ASSERT(_value._number == (json_number)((long long)_value._number), json_string(JSON_TEXT("(long long) will truncate ")) + _string);
 		  return (long long)_value._number;
-	   #endif
+	   #endif /*<- */
     }
 
-    #ifdef JSON_ISO_STRICT
+    #ifdef JSON_ISO_STRICT /*-> JSON_ISO_STRICT */
 	   internalJSONNode::operator unsigned long() const json_nothrow
-    #else
+    #else /*<- else */
 	   internalJSONNode::operator unsigned long long() const json_nothrow
-    #endif
+    #endif /*<- */
     {
 	   Fetch();
-	   switch(type()){
-		  case JSON_NULL:
-			 return 0;
-		  case JSON_BOOL:
-			 return _value._bool ? 1 : 0;
-		  case JSON_STRING:
-			 FetchNumber();
-	   }
-	   JSON_ASSERT(type() == JSON_NUMBER, JSON_TEXT("as_int returning undefined results"));
-	   #ifdef JSON_ISO_STRICT
-		  JSON_ASSERT(_value._number > 0, _string + JSON_TEXT(" is outside the lower range of unsigned long"));
-		  JSON_ASSERT(_value._number < ULONG_MAX, _string + JSON_TEXT(" is outside the upper range of unsigned long"));
+	   #ifdef JSON_CASTABLE /*-> JSON_CASTABLE */
+		  switch(type()){
+			 case JSON_NULL:
+				return 0;
+			 case JSON_BOOL:
+				return _value._bool ? 1 : 0;
+			 case JSON_STRING:
+				FetchNumber();
+		  }
+	   #endif /*<- */
+	   #ifdef JSON_ISO_STRICT /*-> JSON_ISO_STRICT */
+		  JSON_ASSERT(type() == JSON_NUMBER, json_global(ERROR_UNDEFINED) + JSON_TEXT("(unsigned long)"));
+		  JSON_ASSERT(_value._number > 0, _string + json_global(ERROR_LOWER_RANGE) + JSON_TEXT("unsigned long"));
+		  JSON_ASSERT(_value._number < ULONG_MAX, _string + json_global(ERROR_UPPER_RANGE) + JSON_TEXT("unsigned long"));
 		  JSON_ASSERT(_value._number == (json_number)((unsigned long)_value._number), json_string(JSON_TEXT("(unsigend long) will truncate ")) + _string);
 		  return (unsigned long)_value._number;
-	   #else
-		  JSON_ASSERT(_value._number > 0, _string + JSON_TEXT(" is outside the lower range of unsigned long long"));
+	   #else /*<- else */
+		  JSON_ASSERT(type() == JSON_NUMBER, json_global(ERROR_UNDEFINED) + JSON_TEXT("(unsigned long long)"));
+		  JSON_ASSERT(_value._number > 0, _string + json_global(ERROR_LOWER_RANGE) + JSON_TEXT("unsigned long long"));
 		  #ifdef ULONG_LONG_MAX
-			 JSON_ASSERT(_value._number < ULONG_LONG_MAX, _string + JSON_TEXT(" is outside the upper range of unsigned long long"));
+			 JSON_ASSERT(_value._number < ULONG_LONG_MAX, _string + json_global(ERROR_UPPER_RANGE) + JSON_TEXT("unsigned long long"));
 		  #elif defined(ULLONG_MAX)
-			 JSON_ASSERT(_value._number < ULLONG_MAX, _string + JSON_TEXT(" is outside the upper range of unsigned long long"));
+			 JSON_ASSERT(_value._number < ULLONG_MAX, _string + json_global(ERROR_UPPER_RANGE) + JSON_TEXT("unsigned long long"));
 		  #endif
 		  JSON_ASSERT(_value._number == (json_number)((unsigned long long)_value._number), json_string(JSON_TEXT("(unsigned long long) will truncate ")) + _string);
 		  return (unsigned long long)_value._number;
-	   #endif
+	   #endif /*<- */
     }
-#endif
+#endif /*<- */
+	
+	/*
+	 These functions are to allow allocation to be completely controlled by the callbacks
+	 */
+	
+#ifdef JSON_MEMORY_POOL /*-> JSON_MEMORY_POOL */
+	#include "JSONMemoryPool.h"
+	static memory_pool<INTERNALNODEPOOL> json_internal_mempool;
+#endif /*<- */
+	
+void internalJSONNode::deleteInternal(internalJSONNode * ptr) json_nothrow {
+	#ifdef JSON_MEMORY_POOL /*-> JSON_MEMORY_POOL */
+		ptr -> ~internalJSONNode();
+		json_internal_mempool.deallocate((void*)ptr);
+	#elif defined(JSON_MEMORY_CALLBACKS) /*<- else JSON_MEMORY_CALLBACKS */
+		ptr -> ~internalJSONNode();
+		libjson_free<internalJSONNode>(ptr);
+	#else /*<- else */
+		delete ptr;
+	#endif /*<- */
+}
+	
+internalJSONNode * internalJSONNode::newInternal(char mytype) {
+	#ifdef JSON_MEMORY_POOL /*-> JSON_MEMORY_POOL */
+		return new((internalJSONNode*)json_internal_mempool.allocate()) internalJSONNode(mytype);
+	#elif defined(JSON_MEMORY_CALLBACKS) /*<- else JSON_MEMORY_CALLBACKS */
+		return new(json_malloc<internalJSONNode>(1)) internalJSONNode(mytype);
+	#else /*<- else */
+		return new internalJSONNode(mytype);
+	#endif /*<- */
+}
+	
+#ifdef JSON_READ_PRIORITY /*-> JSON_READ_PRIORITY */
+internalJSONNode * internalJSONNode::newInternal(const json_string & unparsed) {
+	#ifdef JSON_MEMORY_POOL /*-> JSON_MEMORY_POOL */
+		return new((internalJSONNode*)json_internal_mempool.allocate()) internalJSONNode(unparsed);
+	#elif defined(JSON_MEMORY_CALLBACKS) /*<- else JSON_MEMORY_CALLBACKS */
+		return new(json_malloc<internalJSONNode>(1)) internalJSONNode(unparsed);
+	#else /*<- else */
+		return new internalJSONNode(unparsed);
+	#endif /*<- */
+}
+	
+internalJSONNode * internalJSONNode::newInternal(const json_string & name_t, const json_string & value_t) {
+	#ifdef JSON_MEMORY_POOL /*-> JSON_MEMORY_POOL */
+		return new((internalJSONNode*)json_internal_mempool.allocate()) internalJSONNode(name_t, value_t);
+	#elif defined(JSON_MEMORY_CALLBACKS) /*<- else JSON_MEMORY_CALLBACKS */
+		return new(json_malloc<internalJSONNode>(1)) internalJSONNode(name_t, value_t);
+	#else /*<- else */
+		return new internalJSONNode(name_t, value_t);
+	#endif /*<- */
+}
+	
+#endif /*<- */
+	
+internalJSONNode * internalJSONNode::newInternal(const internalJSONNode & orig) {
+	#ifdef JSON_MEMORY_POOL /*-> JSON_MEMORY_POOL */
+		return new((internalJSONNode*)json_internal_mempool.allocate()) internalJSONNode(orig);
+	#elif defined(JSON_MEMORY_CALLBACKS) /*<- else JSON_MEMORY_CALLBACKS */
+		return new(json_malloc<internalJSONNode>(1)) internalJSONNode(orig);
+	#else /*<- else */
+		return new internalJSONNode(orig);
+	#endif /*<- */
+}
 
-#ifdef JSON_DEBUG
-    #ifndef JSON_LIBRARY
+#ifdef JSON_DEBUG /*-> JSON_MEMORY_POOL */
+    #ifndef JSON_LIBRARY /*-> JSON_MEMORY_POOL */
 	   JSONNode internalJSONNode::Dump(size_t & totalbytes) const json_nothrow {
 		  JSONNode dumpage(JSON_NODE);
 		  dumpage.set_name(JSON_TEXT("internalJSONNode"));
@@ -635,20 +736,20 @@
 				memory += sizeof(jsonChildren);
 				memory += CHILDREN -> capacity() * sizeof(JSONNode*);
 			 }
-			 #ifdef JSON_COMMENTS
+			 #ifdef JSON_COMMENTS /*-> JSON_COMMENTS */
 				memory += _comment.capacity() * sizeof(json_char);
-			 #endif
+			 #endif /*<- */
 			 totalbytes += memory;
 			 dumpage.push_back(JSON_NEW(JSONNode(JSON_TEXT("bytes used"), memory)));
 		  END_MEM_SCOPE
 
 
-		  #ifdef JSON_REF_COUNT
+		  #ifdef JSON_REF_COUNT /*-> JSON_REF_COUNT */
 			 dumpage.push_back(JSON_NEW(JSONNode(JSON_TEXT("refcount"), refcount)));
-		  #endif
-		  #ifdef JSON_MUTEX_CALLBACKS
+		  #endif /*<- */
+		  #ifdef JSON_MUTEX_CALLBACKS /*-> JSON_MUTEX_CALLBACKS */
 			 dumpage.push_back(JSON_NEW(DumpMutex()));
-		  #endif
+		  #endif /*<- */
 
 
 		  #define DUMPCASE(ty)\
@@ -694,18 +795,18 @@
 			 dumpage.push_back(JSON_NEW(unio));
 		  }
 
-		  #if !defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY)
+		  #if !defined(JSON_PREPARSE) && defined(JSON_READ_PRIORITY) /*-> !JSON_PREPARSE && JSON_READ_PRIORITY */
 			 dumpage.push_back(JSON_NEW(JSONNode(JSON_TEXT("fetched"), fetched)));
-		  #endif
+		  #endif /*<- */
 
-		  #ifdef JSON_COMMENTS
+		  #ifdef JSON_COMMENTS /*-> JSON_COMMENTS */
 			 str.clear();
 			 str.set_name(JSON_TEXT("_comment"));
 			 str.push_back(JSON_NEW(JSONNode(JSON_TEXT("value"), _comment)));
 			 str.push_back(JSON_NEW(JSONNode(JSON_TEXT("length"), _comment.length())));
 			 str.push_back(JSON_NEW(JSONNode(JSON_TEXT("capactiy"), _comment.capacity())));
 			 dumpage.push_back(JSON_NEW(str));
-		  #endif
+		  #endif /*<- */
 
 		  if (isContainer()){
 			 JSONNode arra(JSON_NODE);
@@ -723,5 +824,5 @@
 
 		  return dumpage;
 	   }
-    #endif
-#endif
+    #endif /*<- */
+#endif /*<- */

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.h Changed

@@ -4,9 +4,11 @@
 #include "JSONDebug.h"
 #include "JSONChildren.h"
 #include "JSONMemory.h"
+#include "JSONGlobals.h"
 #ifdef JSON_DEBUG
     #include <climits>  //to check int value
 #endif
+#include "JSONSharedString.h"
 
 #ifdef JSON_LESS_MEMORY
     #ifdef __GNUC__
@@ -58,13 +60,6 @@
     #define initializeComment(x)
 #endif
 
-#ifndef JSON_UNIT_TEST
-    #define incAllocCount() (void)0
-    #define decAllocCount() (void)0
-    #define incinternalAllocCount() (void)0
-    #define decinternalAllocCount() (void)0
-#endif
-
 #ifdef JSON_LESS_MEMORY
     #define CHILDREN _value.Children
     #define DELETE_CHILDREN()\
@@ -85,6 +80,7 @@
 
 class internalJSONNode {
 public:
+	LIBJSON_OBJECT(internalJSONNode);
     internalJSONNode(char mytype = JSON_NULL) json_nothrow json_hot;
     #ifdef JSON_READ_PRIORITY
 	   internalJSONNode(const json_string & unparsed) json_nothrow json_hot;
@@ -192,19 +188,16 @@
 	   void _set_mutex(void * mutex, bool unset = true) json_nothrow json_cold;
 	   void _unset_mutex(void) json_nothrow json_cold;
     #endif
-    #ifdef JSON_UNIT_TEST
-	   static void incinternalAllocCount(void) json_nothrow;
-	   static void decinternalAllocCount(void) json_nothrow;
-    #endif
 
     #ifdef JSON_WRITE_PRIORITY
-	   json_string WriteName(bool formatted, bool arrayChild) const json_nothrow json_write_priority;
+		void DumpRawString(json_string & output) const json_nothrow json_write_priority;
+	   void WriteName(bool formatted, bool arrayChild, json_string & output) const json_nothrow json_write_priority;
 	   #ifdef JSON_ARRAY_SIZE_ON_ONE_LINE
-		  json_string WriteChildrenOneLine(unsigned int indent) const json_nothrow json_write_priority;
+		  void WriteChildrenOneLine(unsigned int indent, json_string & output) const json_nothrow json_write_priority;
 	   #endif
-	   json_string WriteChildren(unsigned int indent) const json_nothrow json_write_priority;
-	   json_string WriteComment(unsigned int indent) const json_nothrow json_write_priority;
-	   json_string Write(unsigned int indent, bool arrayChild) const json_nothrow json_write_priority;
+	   void WriteChildren(unsigned int indent, json_string & output) const json_nothrow json_write_priority;
+	   void WriteComment(unsigned int indent, json_string & output) const json_nothrow json_write_priority;
+	   void Write(unsigned int indent, bool arrayChild, json_string & output) const json_nothrow json_write_priority;
     #endif
 
 
@@ -301,10 +294,10 @@
     initializeMutex(0)
     initializeRefCount(1)
     initializeFetch(true)
-    initializeComment(EMPTY_JSON_STRING)
+    initializeComment(json_global(EMPTY_JSON_STRING))
     initializeChildren((_type == JSON_NODE || _type == JSON_ARRAY) ? jsonChildren::newChildren() : 0){
 
-    incinternalAllocCount();
+    LIBJSON_CTOR;
 
     #ifdef JSON_LESS_MEMORY
 	   //if not less memory, its in the initialization list
@@ -353,9 +346,6 @@
 
 #ifdef JSON_COMMENTS
     inline void internalJSONNode::setcomment(const json_string & comment) json_nothrow {
-	   #ifdef JSON_LESS_MEMORY
-		  JSON_ASSERT(comment.capacity() == comment.length(), JSON_TEXT("comment object too large"));
-	   #endif
 	   _comment = comment;
     }
 
@@ -367,7 +357,7 @@
 inline bool internalJSONNode::IsEqualTo(const json_string & val) const json_nothrow {
     if (type() != JSON_STRING) return false;
     Fetch();
-    return val == _string;
+    return _string == val;
 }
 
 inline bool internalJSONNode::IsEqualTo(bool val) const json_nothrow {
@@ -422,13 +412,13 @@
 }
 
 inline JSONNode ** internalJSONNode::begin(void) const json_nothrow {
-    JSON_ASSERT_SAFE(isContainer(), JSON_TEXT("calling begin on non-container type"), return 0;);
+    JSON_ASSERT_SAFE(isContainer(), json_global(ERROR_NON_CONTAINER) + JSON_TEXT("begin"), return 0;);
     Fetch();
     return CHILDREN -> begin();
 }
 
 inline JSONNode ** internalJSONNode::end(void) const json_nothrow {
-    JSON_ASSERT_SAFE(isContainer(), JSON_TEXT("calling end on non-container type"), return 0;);
+    JSON_ASSERT_SAFE(isContainer(), json_global(ERROR_NON_CONTAINER) + JSON_TEXT("end"), return 0;);
     Fetch();
     return CHILDREN -> end();
 }
@@ -445,7 +435,7 @@
     inline void internalJSONNode::reserve(json_index_t siz) json_nothrow
 #endif
 {
-    JSON_ASSERT_SAFE(isContainer(), JSON_TEXT("calling reserve on non-container type"), return;);
+    JSON_ASSERT_SAFE(isContainer(), json_global(ERROR_NON_CONTAINER) + JSON_TEXT("reserve"), return;);
     Fetch();
     jsonChildren::reserve2(CHILDREN, siz);
 }
@@ -464,8 +454,8 @@
 
     #define IMP_SMALLER_INT_CAST_OP(_type, type_max, type_min)\
 	   inline internalJSONNode::operator _type() const json_nothrow {\
-		  JSON_ASSERT(_value._number > type_min, _string + json_string(JSON_TEXT(" is outside the lower range of ")) + JSON_TEXT(#_type));\
-		  JSON_ASSERT(_value._number < type_max, _string + json_string(JSON_TEXT(" is outside the upper range of ")) + JSON_TEXT(#_type));\
+		  JSON_ASSERT(_value._number > type_min, _string + json_global(ERROR_LOWER_RANGE) + JSON_TEXT(#_type));\
+		  JSON_ASSERT(_value._number < type_max, _string + json_global(ERROR_UPPER_RANGE) + JSON_TEXT(#_type));\
 		  JSON_ASSERT(_value._number == (json_number)((_type)(_value._number)), json_string(JSON_TEXT("(")) + json_string(JSON_TEXT(#_type)) + json_string(JSON_TEXT(") will truncate ")) + _string);\
 		  return (_type)static_cast<BASE_CONVERT_TYPE>(*this);\
 	   }
@@ -504,56 +494,6 @@
     #endif
 #endif
 
-
-
-
-/*
-    These functions are to allow allocation to be completely controlled by the callbacks
-*/
-
-inline void internalJSONNode::deleteInternal(internalJSONNode * ptr) json_nothrow {
-    #ifdef JSON_MEMORY_CALLBACKS
-	   ptr -> ~internalJSONNode();
-	   libjson_free<internalJSONNode>(ptr);
-    #else
-	   delete ptr;
-    #endif
-}
-
-inline internalJSONNode * internalJSONNode::newInternal(char mytype) {
-    #ifdef JSON_MEMORY_CALLBACKS
-	   return new(json_malloc<internalJSONNode>(1)) internalJSONNode(mytype);
-    #else
-	   return new internalJSONNode(mytype);
-    #endif
-}
-
-#ifdef JSON_READ_PRIORITY
-inline internalJSONNode * internalJSONNode::newInternal(const json_string & unparsed) {
-    #ifdef JSON_MEMORY_CALLBACKS
-	   return new(json_malloc<internalJSONNode>(1)) internalJSONNode(unparsed);
-    #else
-	   return new internalJSONNode(unparsed);
-    #endif
-}
-
-inline internalJSONNode * internalJSONNode::newInternal(const json_string & name_t, const json_string & value_t) {
-    #ifdef JSON_MEMORY_CALLBACKS
-	   return new(json_malloc<internalJSONNode>(1)) internalJSONNode(name_t, value_t);
-    #else
-	   return new internalJSONNode(name_t, value_t);
-    #endif
-}
-#endif
-
-inline internalJSONNode * internalJSONNode::newInternal(const internalJSONNode & orig) {
-    #ifdef JSON_MEMORY_CALLBACKS
-	   return new(json_malloc<internalJSONNode>(1)) internalJSONNode(orig);
-    #else
-	   return new internalJSONNode(orig);
-    #endif
-}
-
 #ifdef JSON_LESS_MEMORY
     #ifdef __GNUC__
 	   #pragma pack(pop)

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/Source/libjson.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/Source/libjson.cpp Changed

@@ -12,15 +12,11 @@
     #include "JSONWorker.h"
     #include "JSONValidator.h"
     #include "JSONStream.h"
+	#include "JSONGlobals.h"
     #include <stdexcept>  //some methods throw exceptions
     #ifdef JSON_MEMORY_MANAGE
-	   auto_expand StringHandler;
-	   auto_expand_node NodeHandler;
-	   #define MANAGER_INSERT(x) NodeHandler.insert(x)
-	   #ifdef JSON_STREAM
-		  auto_expand_stream StreamHandler;
-		  #define MANAGER_STREAM_INSERT(x) StreamHandler.insert(x)
-	   #endif
+	   #define MANAGER_INSERT(x) json_global(NODE_HANDLER).insert(x)
+	   #define MANAGER_STREAM_INSERT(x) json_global(STREAM_HANDLER).insert(x)
     #else
 	   #define MANAGER_INSERT(x) x
 	   #define MANAGER_STREAM_INSERT(x) x
@@ -28,14 +24,27 @@
 
     static const json_char * EMPTY_CSTRING(JSON_TEXT(""));
 
+	#ifdef JSON_MEMORY_POOL
+		#include "JSONMemoryPool.h"
+		extern memory_pool<NODEPOOL> json_node_mempool;
+	#endif
+
     inline json_char * toCString(const json_string & str) json_nothrow {
 	   const size_t len = (str.length() + 1) * sizeof(json_char);
 	   #ifdef JSON_MEMORY_MANAGE
-		  return (json_char *)StringHandler.insert(memcpy(json_malloc<json_char>(len), str.c_str(), len));
+		  return (json_char *)json_global(STRING_HANDLER).insert(std::memcpy(json_malloc<json_char>(len), str.c_str(), len));
 	   #else
-		  return (json_char *)memcpy(json_malloc<json_char>(len), str.c_str(), len);
+		  return (json_char *)std::memcpy(json_malloc<json_char>(len), str.c_str(), len);
 	   #endif
     }
+	
+	inline json_char * alreadyCString(json_char * str) json_nothrow {
+		#ifdef JSON_MEMORY_MANAGE
+		   return (json_char *)json_global(STRING_HANDLER).insert(str);
+	    #else
+			return str;
+		#endif
+	}
 
     /*
 	   stuff that's in namespace libjson
@@ -43,7 +52,7 @@
     void json_free(void * str){
 	   JSON_ASSERT_SAFE(str, JSON_TEXT("freeing null ptr"), return;);
 	   #ifdef JSON_MEMORY_MANAGE
-		  StringHandler.remove(str);
+		  json_global(STRING_HANDLER).remove(str);
 	   #endif
 	   libjson_free<void>(str);
     }
@@ -51,18 +60,18 @@
     void json_delete(JSONNODE * node){
 	   JSON_ASSERT_SAFE(node, JSON_TEXT("deleting null ptr"), return;);
 	   #ifdef JSON_MEMORY_MANAGE
-		  NodeHandler.remove(node);
+		  json_global(NODE_HANDLER).remove(node);
 	   #endif
 	   JSONNode::deleteJSONNode((JSONNode *)node);
     }
 
     #ifdef JSON_MEMORY_MANAGE
 	   void json_free_all(void){
-		  StringHandler.clear();
+		  json_global(STRING_HANDLER).clear();
 	   }
 
 	   void json_delete_all(void){
-		  NodeHandler.clear();
+		  json_global(NODE_HANDLER).clear();
 	   }
     #endif
 
@@ -72,7 +81,7 @@
 		  json_try {
 			 //use this constructor to simply copy reference instead of copying the temp
 			 return MANAGER_INSERT(JSONNode::newJSONNode_Shallow(JSONWorker::parse(TOCONST_CSTR(json))));
-		  } json_catch (std::invalid_argument, )
+		  } json_catch (std::invalid_argument, (void)0; )
 		  #ifndef JSON_NO_EXCEPTIONS
 			 return 0;
 		  #endif
@@ -83,7 +92,7 @@
 		  json_try {
 			 //use this constructor to simply copy reference instead of copying the temp
 			 return MANAGER_INSERT(JSONNode::newJSONNode_Shallow(JSONWorker::parse_unformatted(TOCONST_CSTR(json))));
-		  } json_catch(std::invalid_argument, )
+		  } json_catch(std::invalid_argument, (void)0; )
 		  #ifndef JSON_NO_EXCEPTIONS
 			 return 0;
 		  #endif
@@ -92,7 +101,7 @@
 
     json_char * json_strip_white_space(json_const json_char * json){
 	   JSON_ASSERT_SAFE(json, JSON_TEXT("null ptr to json_strip_white_space"), return 0;);
-	   return toCString(JSONWorker::RemoveWhiteSpaceAndComments(TOCONST_CSTR(json)));
+	   return alreadyCString(JSONWorker::RemoveWhiteSpaceAndCommentsC(TOCONST_CSTR(json), false));
     }
 
     #ifdef JSON_VALIDATE
@@ -107,11 +116,25 @@
 	   #endif
 	   json_bool_t json_is_valid(json_const json_char * json){
 		  JSON_ASSERT_SAFE(json, JSON_TEXT("null ptr to json_is_valid"), return (json_bool_t)false;);
-		  return (json_bool_t)JSONValidator::isValidRoot(JSONWorker::RemoveWhiteSpaceAndComments(json).c_str());
+		  #ifdef JSON_SECURITY_MAX_STRING_LENGTH
+			 if (json_unlikely(json_strlen(json) > JSON_SECURITY_MAX_STRING_LENGTH)){
+				JSON_FAIL(JSON_TEXT("Exceeding JSON_SECURITY_MAX_STRING_LENGTH"));
+				return false;
+			 }
+		  #endif
+		  json_auto<json_char> s;
+		  s.set(JSONWorker::RemoveWhiteSpaceAndCommentsC(json, false));
+		  return (json_bool_t)JSONValidator::isValidRoot(s.ptr);
 	   }
 
 	   json_bool_t json_is_valid_unformatted(json_const json_char * json){
 		  JSON_ASSERT_SAFE(json, JSON_TEXT("null ptr to json_is_valid_unformatted"), return (json_bool_t)true;);
+		  #ifdef JSON_SECURITY_MAX_STRING_LENGTH
+			 if (json_unlikely(json_strlen(json) > JSON_SECURITY_MAX_STRING_LENGTH)){
+				JSON_FAIL(JSON_TEXT("Exceeding JSON_SECURITY_MAX_STRING_LENGTH"));
+				return false;
+			 }
+		  #endif
 		  return (json_bool_t)JSONValidator::isValidRoot(json);
 	   }
     #endif
@@ -170,14 +193,19 @@
 	   void json_delete_stream(JSONSTREAM * stream){
 		  JSON_ASSERT_SAFE(stream, JSON_TEXT("deleting null ptr"), return;);
 		  #ifdef JSON_MEMORY_MANAGE
-			 StreamHandler.remove(stream);
+			 json_global(STREAM_HANDLER).remove(stream);
 		  #endif
 		  JSONStream::deleteJSONStream((JSONStream *)stream);
 	   }
 
-	   JSONSTREAM * json_new_stream(json_stream_callback_t callback){
-		  return MANAGER_STREAM_INSERT(JSONStream::newJSONStream(callback));
+	   JSONSTREAM * json_new_stream(json_stream_callback_t callback, json_stream_e_callback_t e_callback, void * identifier){
+		  return MANAGER_STREAM_INSERT(JSONStream::newJSONStream(callback, e_callback, identifier));
 	   }
+
+		void json_stream_reset(JSONSTREAM * stream){
+			JSON_ASSERT_SAFE(stream, JSON_TEXT("resetting null ptr"), return;);
+			((JSONStream*)stream) -> reset();
+		}
     #endif
 
 
@@ -188,7 +216,9 @@
     JSONNODE * json_new_a(json_const json_char * name, json_const json_char * value){
 	   if (!name) name = EMPTY_CSTRING;
 	   JSON_ASSERT_SAFE(value, JSON_TEXT("null value to json_new_a"), value = EMPTY_CSTRING;);
-	   #ifdef JSON_MEMORY_CALLBACKS
+		#ifdef JSON_MEMORY_POOL
+			return MANAGER_INSERT(new((JSONNode*)json_node_mempool.allocate()) JSONNode(TOCONST_CSTR(name), json_string(TOCONST_CSTR(value))));
+		#elif defined(JSON_MEMORY_CALLBACKS)
 		  return MANAGER_INSERT(new(json_malloc<JSONNode>(1)) JSONNode(TOCONST_CSTR(name), json_string(TOCONST_CSTR(value))));
 	   #else
 		  return MANAGER_INSERT(new JSONNode(TOCONST_CSTR(name), json_string(TOCONST_CSTR(value))));
@@ -197,7 +227,9 @@
 
     JSONNODE * json_new_i(json_const json_char * name, json_int_t value){
 	   if (!name) name = EMPTY_CSTRING;
-	   #ifdef JSON_MEMORY_CALLBACKS
+		#ifdef JSON_MEMORY_POOL
+			return MANAGER_INSERT(new((JSONNode*)json_node_mempool.allocate()) JSONNode(TOCONST_CSTR(name), value));
+		#elif defined(JSON_MEMORY_CALLBACKS)
 		  return MANAGER_INSERT(new(json_malloc<JSONNode>(1)) JSONNode(TOCONST_CSTR(name), value));
 	   #else
 		  return MANAGER_INSERT(new JSONNode(TOCONST_CSTR(name), value));
@@ -206,7 +238,9 @@
 
     JSONNODE * json_new_f(json_const json_char * name, json_number value){
 	   if (!name) name = EMPTY_CSTRING;
-	   #ifdef JSON_MEMORY_CALLBACKS
+		#ifdef JSON_MEMORY_POOL
+			return MANAGER_INSERT(new((JSONNode*)json_node_mempool.allocate()) JSONNode(TOCONST_CSTR(name), value));
+		#elif defined(JSON_MEMORY_CALLBACKS)
 		  return MANAGER_INSERT(new(json_malloc<JSONNode>(1)) JSONNode(TOCONST_CSTR(name), value));
 	   #else
 		  return MANAGER_INSERT(new JSONNode(TOCONST_CSTR(name), value));
@@ -215,7 +249,9 @@
 
     JSONNODE * json_new_b(json_const json_char * name, json_bool_t value){
 	   if (!name) name = EMPTY_CSTRING;
-	   #ifdef JSON_MEMORY_CALLBACKS
+		#ifdef JSON_MEMORY_POOL
+			return MANAGER_INSERT(new((JSONNode*)json_node_mempool.allocate()) JSONNode(TOCONST_CSTR(name), static_cast<bool>(value)));
+		#elif defined(JSON_MEMORY_CALLBACKS)
 		  return MANAGER_INSERT(new(json_malloc<JSONNode>(1)) JSONNode(TOCONST_CSTR(name), static_cast<bool>(value)));
 	   #else
 		  return MANAGER_INSERT(new JSONNode(TOCONST_CSTR(name), static_cast<bool>(value)));
@@ -223,21 +259,25 @@
     }
 
     JSONNODE * json_new(char type){
-	   #ifdef JSON_MEMORY_CALLBACKS
+		#ifdef JSON_MEMORY_POOL
+			return MANAGER_INSERT(new((JSONNode*)json_node_mempool.allocate()) JSONNode(type));
+	    #elif defined(JSON_MEMORY_CALLBACKS)
 		  return MANAGER_INSERT(new(json_malloc<JSONNode>(1)) JSONNode(type));
 	   #else
 		  return MANAGER_INSERT(new JSONNode(type));
 	   #endif
     }
 
-    JSONNODE * json_copy(json_const JSONNODE * orig){
-	   JSON_ASSERT_SAFE(orig, JSON_TEXT("null orig to json_copy"), return 0;);
-	   #ifdef JSON_MEMORY_CALLBACKS
-		  return MANAGER_INSERT(new(json_malloc<JSONNode>(1)) JSONNode(*((JSONNode*)orig)));
-	   #else
-		  return MANAGER_INSERT(new JSONNode(*((JSONNode*)orig)));
-	   #endif
-    }
+	JSONNODE * json_copy(json_const JSONNODE * orig){
+		JSON_ASSERT_SAFE(orig, JSON_TEXT("null orig to json_copy"), return 0;);
+		#ifdef JSON_MEMORY_POOL
+			return MANAGER_INSERT(new((JSONNode*)json_node_mempool.allocate()) JSONNode(*((JSONNode*)orig)));
+		#elif defined(JSON_MEMORY_CALLBACKS)
+			return MANAGER_INSERT(new(json_malloc<JSONNode>(1)) JSONNode(*((JSONNode*)orig)));
+		#else
+			return MANAGER_INSERT(new JSONNode(*((JSONNode*)orig)));
+		#endif
+	}
 
     JSONNODE * json_duplicate(json_const JSONNODE * orig){
 	   JSON_ASSERT_SAFE(orig, JSON_TEXT("null orig to json_duplicate"), return 0;);
@@ -325,15 +365,17 @@
 	   //return (json_bool_t)static_cast<bool>(*((JSONNode*)node));
     }
 
-    JSONNODE * json_as_node(json_const JSONNODE * node){
-	   JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_as_node"), return 0;);
-	   return MANAGER_INSERT(JSONNode::newJSONNode_Shallow(((JSONNode*)node) -> as_node()));
-    }
+	#ifdef JSON_CASTABLE
+		JSONNODE * json_as_node(json_const JSONNODE * node){
+		   JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_as_node"), return 0;);
+		   return MANAGER_INSERT(JSONNode::newJSONNode_Shallow(((JSONNode*)node) -> as_node()));
+		}
 
-    JSONNODE * json_as_array(json_const JSONNODE * node){
-	   JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_as_array"), return 0;);
-	   return MANAGER_INSERT(JSONNode::newJSONNode_Shallow(((JSONNode*)node) -> as_array()));
-    }
+		JSONNODE * json_as_array(json_const JSONNODE * node){
+		   JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_as_array"), return 0;);
+		   return MANAGER_INSERT(JSONNode::newJSONNode_Shallow(((JSONNode*)node) -> as_array()));
+		}
+	#endif
 
     #if defined(JSON_BINARY) || defined(JSON_EXPOSE_BASE64)
 	   static void * returnDecode64(const std::string & result, unsigned long * size) json_nothrow json_cold;
@@ -344,9 +386,9 @@
 			 if (json_unlikely(result.empty())) return 0;
 		  #endif
 		  #ifdef JSON_MEMORY_MANAGE
-			 return StringHandler.insert(memcpy(json_malloc<char>(len), result.data(), len));
+			 return json_global(STRING_HANDLER).insert(std::memcpy(json_malloc<char>(len), result.data(), len));
 		  #else
-			 return memcpy(json_malloc<char>(len), result.data(), len);
+			 return std::memcpy(json_malloc<char>(len), result.data(), len);
 		  #endif
 	   }
     #endif
@@ -364,9 +406,9 @@
 	   json_char * json_encode64(json_const void * binary, json_index_t bytes){
 		  const json_string result(JSONBase64::json_encode64((const unsigned char *)binary, (size_t)bytes));
 		  #ifdef JSON_MEMORY_MANAGE
-			 return StringHandler.insert(memcpy(json_malloc<json_char>(result.length()), result.c_str(), result.length()));
+			 return (json_char*)json_global(STRING_HANDLER).insert((json_char*)std::memcpy(json_malloc<json_char>(result.length() + 1), result.c_str(), (result.length() + 1) * sizeof(json_char)));
 		  #else
-			 return (json_char*)memcpy(json_malloc<json_char>(bytes), result.c_str(), bytes);
+			 return (json_char*)std::memcpy(json_malloc<json_char>(result.length() + 1), result.c_str(), (result.length() + 1) * sizeof(json_char));
 		  #endif
 	   }
 
@@ -439,10 +481,12 @@
 	   }
     #endif
 
-    void json_cast(JSONNODE * node, char type){
-	   JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_cast"), return;);
-	   ((JSONNode*)node) -> cast(type);
-    }
+    #ifdef JSON_CASTABLE
+	   void json_cast(JSONNODE * node, char type){
+		  JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_cast"), return;);
+		  ((JSONNode*)node) -> cast(type);
+	   }
+    #endif
 
     //children access
     void json_reserve(JSONNODE * node, json_index_t siz){
@@ -454,7 +498,7 @@
 	   JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_at"), return 0;);
 	   json_try {
 		  return &((JSONNode*)node) -> at(pos);
-	   } json_catch (std::out_of_range, )
+	   } json_catch (std::out_of_range, (void)0; )
 	   #ifndef JSON_NO_EXCEPTIONS
 		  return 0;
 	   #endif
@@ -465,7 +509,7 @@
 	   JSON_ASSERT_SAFE(name, JSON_TEXT("null node to json_get.  Did you mean to use json_at?"), return 0;);
 	   json_try {
 		  return &((JSONNode*)node) -> at(TOCONST_CSTR(name));
-	   } json_catch (std::out_of_range, )
+	   } json_catch (std::out_of_range, (void)0; )
 	   #ifndef JSON_NO_EXCEPTIONS
 		  return 0;
 	   #endif
@@ -478,7 +522,7 @@
 		  JSON_ASSERT_SAFE(name, JSON_TEXT("null name to json_at_nocase"), return 0;);
 		  json_try {
 			 return &((JSONNode*)node) -> at_nocase(TOCONST_CSTR(name));
-		  } json_catch (std::out_of_range, )
+		  } json_catch (std::out_of_range, (void)0; )
 		  #ifndef JSON_NO_EXCEPTIONS
 			 return 0;
 		  #endif
@@ -495,7 +539,7 @@
 	   JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_push_back"), return;);
 	   JSON_ASSERT_SAFE(node2, JSON_TEXT("null node2 to json_push_back"), return;);
 	   #ifdef JSON_MEMORY_MANAGE
-		  NodeHandler.remove(node2);
+		  json_global(NODE_HANDLER).remove(node2);
 	   #endif
 	   ((JSONNode*)node) -> push_back((JSONNode*)node2);
     }
@@ -532,7 +576,7 @@
 
 	   JSONNODE_ITERATOR json_insert(JSONNODE * node, JSONNODE_ITERATOR it, JSONNODE * node2){
 		  #ifdef JSON_MEMORY_MANAGE
-			 NodeHandler.remove(node2);
+			 json_global(NODE_HANDLER).remove(node2);
 		  #endif
 		  return (JSONNODE_ITERATOR)(((JSONNode*)node) -> insert((JSONNode**)it, (JSONNode*)node2));
 	   }

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/libjson.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/libjson.h Changed

@@ -65,9 +65,10 @@
 		  #endif
 
 		  #ifdef JSON_STREAM
-			 JSONSTREAM * json_new_stream(json_stream_callback_t callback);
+			 JSONSTREAM * json_new_stream(json_stream_callback_t callback, json_stream_e_callback_t e_callback, void * identifier);
 			 void json_stream_push(JSONSTREAM * stream, json_const json_char * addendum);
 			 void json_delete_stream(JSONSTREAM * stream);
+		     void json_stream_reset(JSONSTREAM * stream);
 		  #endif
 
 
@@ -102,8 +103,10 @@
 		  json_int_t json_as_int(json_const JSONNODE * node);
 		  json_number json_as_float(json_const JSONNODE * node);
 		  json_bool_t json_as_bool(json_const JSONNODE * node);
-		  JSONNODE * json_as_node(json_const JSONNODE * node);
-		  JSONNODE * json_as_array(json_const JSONNODE * node);
+		  #ifdef JSON_CASTABLE
+			 JSONNODE * json_as_node(json_const JSONNODE * node);
+			 JSONNODE * json_as_array(json_const JSONNODE * node);
+		  #endif
 		  #ifdef JSON_BINARY
 			 void * json_as_binary(json_const JSONNODE * node, unsigned long * size);
 		  #endif
@@ -131,7 +134,9 @@
 			 json_char * json_encode64(json_const void * binary, json_index_t bytes);
 			 void * json_decode64(json_const json_char * text, unsigned long * size);
 		  #endif
-		  void json_cast(JSONNODE * node, char type);
+		  #ifdef JSON_CASTABLE
+			 void json_cast(JSONNODE * node, char type);
+		  #endif
 
 		  /* children access */
 		  void json_reserve(JSONNODE * node, json_index_t siz);
@@ -169,44 +174,109 @@
     #ifndef __cplusplus
 	   #error Turning off JSON_LIBRARY requires C++
     #endif
-    #include "Source/JSONNode.h"  //not used in this file, but libjson.h should be the only file required to use it embedded
-    #include "Source/JSONWorker.h"
-    #include "Source/JSONValidator.h"
-    #include "Source/JSONStream.h"
+    #include "_internal/Source/JSONNode.h"  //not used in this file, but libjson.h should be the only file required to use it embedded
+    #include "_internal/Source/JSONWorker.h"
+    #include "_internal/Source/JSONValidator.h"
+    #include "_internal/Source/JSONStream.h"
+    #include "_internal/Source/JSONPreparse.h"
     #ifdef JSON_EXPOSE_BASE64
-	   #include "Source/JSON_Base64.h"
+	   #include "_internal/Source/JSON_Base64.h"
     #endif
     #ifndef JSON_NO_EXCEPTIONS
 	   #include <stdexcept>  //some methods throw exceptions
     #endif
 
-    namespace libjson {
+	#include <cwchar>  /* need wide characters */
+	#include <string>
+
+    namespace libjson {	   
 	   #ifdef JSON_EXPOSE_BASE64
-		  inline static json_string encode64(const unsigned char * binary, size_t bytes) json_nothrow json_cold {
+		  inline static json_string encode64(const unsigned char * binary, size_t bytes) json_nothrow {
 			 return JSONBase64::json_encode64(binary, bytes);
 		  }
 
-		  inline static std::string decode64(const json_string & encoded) json_nothrow json_cold {
+		  inline static std::string decode64(const json_string & encoded) json_nothrow {
 			 return JSONBase64::json_decode64(encoded);
 		  }
 	   #endif
+	   
+	   //useful if you have json that you don't want to parse, just want to strip to cut down on space
+	   inline static json_string strip_white_space(const json_string & json) json_nothrow {
+		  return JSONWorker::RemoveWhiteSpaceAndComments(json, false);
+	   }
+		
+		#ifndef JSON_STRING_HEADER
+			inline static std::string to_std_string(const json_string & str){
+				#if defined(JSON_UNICODE) ||defined(JSON_MEMORY_CALLBACKS) || defined(JSON_MEMORY_POOL)
+					return std::string(str.begin(), str.end());		
+				#else
+					return str;
+				#endif
+			}
+			inline static std::wstring to_std_wstring(const json_string & str){
+				#if (!defined(JSON_UNICODE)) || defined(JSON_MEMORY_CALLBACKS) || defined(JSON_MEMORY_POOL)
+					return std::wstring(str.begin(), str.end());		
+				#else
+					return str;
+				#endif
+			}
+			
+			inline static json_string to_json_string(const std::string & str){
+				#if defined(JSON_UNICODE) ||defined(JSON_MEMORY_CALLBACKS) || defined(JSON_MEMORY_POOL)
+					return json_string(str.begin(), str.end());		
+				#else
+					return str;
+				#endif
+			}
+			inline static json_string to_json_string(const std::wstring & str){
+				#if (!defined(JSON_UNICODE)) || defined(JSON_MEMORY_CALLBACKS) || defined(JSON_MEMORY_POOL)
+					return json_string(str.begin(), str.end());		
+				#else
+					return str;
+				#endif
+			}
+		#endif
 
 	   #ifdef JSON_READ_PRIORITY
 		  //if json is invalid, it throws a std::invalid_argument exception
 		  inline static JSONNode parse(const json_string & json) json_throws(std::invalid_argument) {
-			 return JSONWorker::parse(json);
+			 #ifdef JSON_PREPARSE
+				size_t len;
+				json_auto<json_char> buffer(JSONWorker::RemoveWhiteSpace(json, len, false));
+				return JSONPreparse::isValidRoot(buffer.ptr);
+			 #else
+				return JSONWorker::parse(json);
+			 #endif
 		  }
 
 		  inline static JSONNode parse_unformatted(const json_string & json) json_throws(std::invalid_argument) {
-			 return JSONWorker::parse_unformatted(json);
+			 #ifdef JSON_PREPARSE
+				return JSONPreparse::isValidRoot(json);
+			 #else
+				return JSONWorker::parse_unformatted(json);
+			 #endif
 		  }
 
 		  #ifdef JSON_VALIDATE
 			 inline static bool is_valid(const json_string & json) json_nothrow {
-				return JSONValidator::isValidRoot(JSONWorker::RemoveWhiteSpaceAndComments(json).c_str());
+				#ifdef JSON_SECURITY_MAX_STRING_LENGTH
+				    if (json_unlikely(json.length() > JSON_SECURITY_MAX_STRING_LENGTH)){
+					   JSON_FAIL(JSON_TEXT("Exceeding JSON_SECURITY_MAX_STRING_LENGTH"));
+					   return false;
+				    }
+				#endif
+				json_auto<json_char> s;
+				s.set(JSONWorker::RemoveWhiteSpaceAndCommentsC(json, false));
+				return JSONValidator::isValidRoot(s.ptr);
 			 }
 
 			 inline static bool is_valid_unformatted(const json_string & json) json_nothrow {
+				#ifdef JSON_SECURITY_MAX_STRING_LENGTH
+				    if (json_unlikely(json.length() > JSON_SECURITY_MAX_STRING_LENGTH)){
+					   JSON_FAIL(JSON_TEXT("Exceeding JSON_SECURITY_MAX_STRING_LENGTH"));
+					   return false;
+				    }
+				#endif
 				return JSONValidator::isValidRoot(json.c_str());
 			 }
 			 #ifdef JSON_DEPRECATED_FUNCTIONS
@@ -219,11 +289,6 @@
 		  #endif
 	   #endif
 
-	   //useful if you have json that you don't want to parse, just want to strip to cut down on space
-	   inline static json_string strip_white_space(const json_string & json) json_nothrow {
-		  return JSONWorker::RemoveWhiteSpaceAndComments(json);
-	   }
-
 	   //When libjson errors, a callback allows the user to know what went wrong
 	   #if defined JSON_DEBUG && !defined JSON_STDERROR
 		  inline static void register_debug_callback(json_error_callback_t callback) json_nothrow {

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreUtils/src/prefs.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreUtils/src/prefs.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreD3D.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreD3D.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2.h Changed

avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2_export.h Added

@@ -0,0 +1,53 @@
+
+#ifndef ADM_COREVIDEOCODEC6_EXPORT_H
+#define ADM_COREVIDEOCODEC6_EXPORT_H
+
+#ifdef ADM_COREVIDEOCODEC6_STATIC_DEFINE
+#  define ADM_COREVIDEOCODEC6_EXPORT
+#  define ADM_COREVIDEOCODEC6_NO_EXPORT
+#else
+#  ifndef ADM_COREVIDEOCODEC6_EXPORT
+#    ifdef ADM_coreDxva26_EXPORTS
+       /* We are building this library */
+#      ifdef _WIN32
+#        define ADM_COREVIDEOCODEC6_EXPORT __declspec(dllexport)
+#      else
+#        define ADM_COREVIDEOCODEC6_EXPORT __attribute__((visibility("default")))
+#      endif
+#    else
+       /* We are using this library */
+#      ifdef _WIN32
+#        define ADM_COREVIDEOCODEC6_EXPORT __declspec(dllimport)
+#      else
+#        define ADM_COREVIDEOCODEC6_EXPORT __attribute__((visibility("default")))
+#      endif
+#    endif
+#  endif
+
+#  ifndef ADM_COREVIDEOCODEC6_NO_EXPORT
+#    ifdef _WIN32
+#      define ADM_COREVIDEOCODEC6_NO_EXPORT 
+#    else
+#      define ADM_COREVIDEOCODEC6_NO_EXPORT __attribute__((visibility("hidden")))
+#    endif
+#  endif
+#endif
+
+#ifndef ADM_COREVIDEOCODEC6_DEPRECATED
+#  ifdef __GNUC__
+#    define ADM_COREVIDEOCODEC6_DEPRECATED __attribute__ ((__deprecated__))
+#    define ADM_COREVIDEOCODEC6_DEPRECATED_EXPORT ADM_COREVIDEOCODEC6_EXPORT __attribute__ ((__deprecated__))
+#    define ADM_COREVIDEOCODEC6_DEPRECATED_NO_EXPORT ADM_COREVIDEOCODEC6_NO_EXPORT __attribute__ ((__deprecated__))
+#  elif defined(_WIN32)
+#    define ADM_COREVIDEOCODEC6_DEPRECATED __declspec(deprecated)
+#    define ADM_COREVIDEOCODEC6_DEPRECATED_EXPORT ADM_COREVIDEOCODEC6_EXPORT __declspec(deprecated)
+#    define ADM_COREVIDEOCODEC6_DEPRECATED_NO_EXPORT ADM_COREVIDEOCODEC6_NO_EXPORT __declspec(deprecated)
+#  endif
+#endif
+
+#define DEFINE_NO_DEPRECATED 0
+#if DEFINE_NO_DEPRECATED
+# define ADM_COREVIDEOCODEC6_NO_DEPRECATED
+#endif
+
+#endif

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreD3D.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreD3D.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreDxva2.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreDxva2.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp Changed

@@ -39,7 +39,7 @@
 
 
 /**
- * 
+ *
  */
 
 
@@ -69,10 +69,10 @@
  bool                   indirectOperationYV12;
  bool                   indirectOperationNV12;
 admLibVA::LIBVA_TRANSFER_MODE    transferMode;
- 
+
  namespace decoders
  {
-        bool            h264; 
+        bool            h264;
  }
 }
 namespace ADM_coreLibVAEnc
@@ -90,8 +90,8 @@
                     configId=-1;
                     hasCBR=false;
                     hasVBR=false;
-                }                    
-                        
+                }
+
  };
  namespace encoders
  {
@@ -109,7 +109,7 @@
 
 /**
  * \fn checkSupportedFunctionsAndImageFormat
- * \brief check if operation through vaDeriveImage is supported and if 
+ * \brief check if operation through vaDeriveImage is supported and if
  *           YV12 or NV12 is supported
  * @param func
  * @param dis
@@ -120,24 +120,24 @@
     bool r=false;
     ADMImageDefault  image1(640,400),image2(640,400);
     VASurfaceID      surface=admLibVA::allocateSurface(640,400); // freed with admSurface
-    ADM_vaSurface    admSurface(640,400);            
+    ADM_vaSurface    admSurface(640,400);
     admSurface.surface=VA_INVALID;
-    
+
     if(surface==VA_INVALID)
     {
         ADM_info("Cannot allocate a surface => not working\n");
         return false;
-    }    
+    }
     admSurface.surface=surface;
-    
-    // Check direct upload/Download works    
+
+    // Check direct upload/Download works
     ADM_info("--Trying direct operations --\n");
     ADM_coreLibVA::directOperation      =tryDirect("direct",admSurface, image1,  image2);
     ADM_info("-- Trying indirect (YV12) --\n");
     ADM_coreLibVA::indirectOperationYV12=tryIndirect(0,admSurface, image1 ,image2);
     ADM_info("-- Trying indirect (NV12) --\nSKIPPED\n");
     ADM_coreLibVA::indirectOperationNV12=false; //tryIndirect(1,admSurface, image1, image2 );
-    
+
     ADM_info("Direct           : %d\n",ADM_coreLibVA::directOperation);
     ADM_info("Indirect NV12    : %d\n",ADM_coreLibVA::indirectOperationNV12);
     ADM_info("Indirect YV12    : %d\n",ADM_coreLibVA::indirectOperationYV12);
@@ -164,14 +164,14 @@
  */
 static void displayXError(const char *func,const VADisplay dis,const VAStatus er)
 {
-    if(!er) return;    
-    ADM_warning("LibVA Error : <%s:%s>\n",func,vaErrorStr((er)));
-    
+    if(!er) return;
+    ADM_warning("LibVA Error : <%s:%s:%d>\n",func,vaErrorStr(er),(int)er);
+
 
 }
 /**
  * \fn setupEncodingConfig
- * @return 
+ * @return
  */
 bool admLibVA::setupEncodingConfig(void)
 {
@@ -179,13 +179,13 @@
     VAEntrypoint entrypoints[5];
     int num_entrypoints;
     VAConfigAttrib attrib[2];
-    
- 
+
+
     CHECK_ERROR(vaQueryConfigEntrypoints(ADM_coreLibVA::display, VAProfileH264Main, entrypoints,        &num_entrypoints));
-    
+
     int found=-1;
     ADM_info("Found %d entry points\n",num_entrypoints);
-    for	(int slice_entrypoint = 0; slice_entrypoint < num_entrypoints; slice_entrypoint++) 
+    for	(int slice_entrypoint = 0; slice_entrypoint < num_entrypoints; slice_entrypoint++)
     {
             ADM_info("   %d is a %d\n",slice_entrypoint,entrypoints[slice_entrypoint] );
         if (entrypoints[slice_entrypoint] == VAEntrypointEncSlice)
@@ -193,7 +193,7 @@
             found=slice_entrypoint;
             break;
         }
-            
+
     }
     if(-1 == found)
     {
@@ -232,7 +232,7 @@
            }
 
     }
-    if(check!=3) 
+    if(check!=3)
     {
         ADM_warning("Some configuration are missing, bailing\n");
         return false;
@@ -243,7 +243,7 @@
     {
         ADM_coreLibVAEnc::encoders::vaH264.configId=-1;
         return false;
-        
+
     }else
     {
         ADM_info("H264 Encoding config created\n");
@@ -256,12 +256,12 @@
  * @param profile
  * @param cid
  * @param name
- * @return 
+ * @return
  */
 static bool checkProfile(const VAProfile &profile,VAConfigID *cid,const char *name)
 {
     VAStatus xError;
-    
+
     *cid=-1;
     VAConfigAttrib attrib;
     attrib.type = VAConfigAttribRTFormat;
@@ -291,7 +291,7 @@
     bool r=false;
     int nb=vaMaxNumProfiles(ADM_coreLibVA::display);
     ADM_info("Max config =  %d \n",nb);
-    VAProfile *prof=(VAProfile *)alloca(sizeof(VAProfile)*nb);
+    VAProfile *prof=(VAProfile *)admAlloca(sizeof(VAProfile)*nb);
     int nbProfiles;
     CHECK_ERROR(vaQueryConfigProfiles (ADM_coreLibVA::display, prof,&nbProfiles));
 
@@ -306,20 +306,20 @@
                 r=true;
                 ADM_info("H264 high profile found\n");
             }
-        }        
+        }
     }
     // if H264 is not supported, no need to go further
     if(!r)
         return false;
-    
-    
-    checkProfile(VAProfileH264High,     &ADM_coreLibVA::configH264,"H264 Hight");    
+
+
+    checkProfile(VAProfileH264High,     &ADM_coreLibVA::configH264,"H264 Hight");
     checkProfile(VAProfileVC1Advanced,  &ADM_coreLibVA::configVC1 ,"VC1");
-#ifdef LIBVA_HEVC_DEC    
-    checkProfile(VAProfileHEVCMain,     &ADM_coreLibVA::configH265,"HEVC Main");    
+#ifdef LIBVA_HEVC_DEC
+    checkProfile(VAProfileHEVCMain,     &ADM_coreLibVA::configH265,"HEVC Main");
     checkProfile(VAProfileHEVCMain10,   &ADM_coreLibVA::configH26510Bits ,"H265 10Bits");
-#endif    
-    
+#endif
+
 #ifdef LIBVA_VP9_DEC
     checkProfile(VAProfileVP9Profile3,  &ADM_coreLibVA::configVP9 ,"VP9");
 #endif
@@ -328,7 +328,7 @@
 /**
  * \fn fourCC_tostring
  * @param fourcc
- * @return 
+ * @return
  */
 static char *fourCC_tostring(uint32_t fourcc)
 {
@@ -342,6 +342,15 @@
 
     return s;
 }
+
+/**
+ * 
+ * @return 
+ */
+VADisplay admLibVA::getDisplay()
+{
+        return ADM_coreLibVA::display;
+}
 /**
  * \fn setupImageFormat
  */
@@ -364,7 +373,7 @@
                 aprintf("----------");
                 aprintf("bpp : %d\n",list[i].bits_per_pixel);
                 uint32_t fcc=list[i].fourcc;
-                aprintf("fcc : 0x%x:%s\n",fcc,fourCC_tostring(fcc));  
+                aprintf("fcc : 0x%x:%s\n",fcc,fourCC_tostring(fcc));
                 switch(fcc)
                 {
                 case VA_FOURCC_NV12:
@@ -377,7 +386,7 @@
                      break;
                 }
             }
-            
+
         }
         if(r==false)
         {
@@ -389,8 +398,8 @@
 /**
  * \fn fillContext
  * @param c
- * @return 
- */    
+ * @return
+ */
 bool admLibVA::fillContext(VAProfile profile ,vaapi_context *c)
 {
     CHECK_WORKING(false);
@@ -399,11 +408,11 @@
     {
        case VAProfileH264High: cid=ADM_coreLibVA::configH264;break;
        case VAProfileVC1Advanced: cid=ADM_coreLibVA::configVC1;break;
-#ifdef LIBVA_HEVC_DEC           
+#ifdef LIBVA_HEVC_DEC
        case VAProfileHEVCMain: cid=ADM_coreLibVA::configH265;break;
        case VAProfileHEVCMain10: cid=ADM_coreLibVA::configH26510Bits;break;
-#endif        
-      
+#endif
+
 #ifdef LIBVA_VP9_DEC
        case VAProfileVP9Profile3: cid=ADM_coreLibVA::configVP9;break;
 #endif
@@ -415,8 +424,8 @@
     c->display=ADM_coreLibVA::display;
     return true;
 }
-    
-    
+
+
 
 /**
     \fn     init
@@ -429,12 +438,12 @@
     int maj=0,min=0,patch=0;
     ADM_info("[LIBVA] Initializing LibVA library ...\n");
 
-    
+
     ADM_coreLibVA::context=NULL;
     ADM_coreLibVA::decoders::h264=false;
     ADM_coreLibVA::directOperation=true;
     ADM_coreLibVA::transferMode=ADM_LIBVA_NONE;
-            
+
     myWindowInfo=*x;
     VAStatus xError;
     int majv,minv;
@@ -445,12 +454,12 @@
         return false;
     }
     ADM_info("VA %d.%d, Vendor = %s\n",majv,minv,vaQueryVendorString(ADM_coreLibVA::display));
-    
+
     if(setupConfig() && setupImageFormat())
     {
         coreLibVAWorking=true;
     }
-    
+
     if(setupEncodingConfig())
     {
         ADM_info("VA: Encoding supported\n");
@@ -469,8 +478,8 @@
     ADM_info("[LIBVA] De-Initializing LibVA library ...\n");
     if(true==coreLibVAWorking)
     {
-         CHECK_ERROR(vaTerminate(ADM_coreLibVA::display));   
-          
+         CHECK_ERROR(vaTerminate(ADM_coreLibVA::display));
+
     }
     coreLibVAWorking=false;
     return true;
@@ -483,9 +492,9 @@
     return coreLibVAWorking;
 }
 /**
- * 
+ *
  * @param profile
- * @return 
+ * @return
  */
 bool        admLibVA::supported(VAProfile profile)
 {
@@ -493,23 +502,23 @@
     switch(profile)
     {
         SUPSUP(VAProfileH264High,configH264)
-        SUPSUP(VAProfileVC1Advanced,configVC1)                
-#ifdef LIBVA_HEVC_DEC                           
+        SUPSUP(VAProfileVC1Advanced,configVC1)
+#ifdef LIBVA_HEVC_DEC
         SUPSUP(VAProfileHEVCMain,configH265)
         SUPSUP(VAProfileHEVCMain10,configH26510Bits)
-#endif                
-      
+#endif
+
 #ifdef LIBVA_VP9_DEC
         SUPSUP(VAProfileVP9Profile3,configVP9)
 #endif
         default:
             ADM_info("This profile is not supported by libva\n");
             break;
-    } 
+    }
     ADM_info("Unknown profile (%d)\n",(int)profile);
 #ifdef LIBVA_VP9_DEC
     ADM_info("Compiled with vp9 support, library says %d\n",ADM_coreLibVA::configVP9);
-#endif    
+#endif
     return false;
 }
 
@@ -517,7 +526,7 @@
  * \fn createDecoder
  * @param width
  * @param height
- * @return 
+ * @return
  */
 
 VAContextID        admLibVA::createDecoder(VAProfile profile,int width, int height,int nbSurface, VASurfaceID *surfaces)
@@ -530,13 +539,13 @@
     switch(profile)
     {
        case VAProfileH264High:    cid=ADM_coreLibVA::configH264;break;
-       case VAProfileVC1Advanced: cid=ADM_coreLibVA::configVC1;break;       
-#ifdef LIBVA_HEVC_DEC                                  
+       case VAProfileVC1Advanced: cid=ADM_coreLibVA::configVC1;break;
+#ifdef LIBVA_HEVC_DEC
        case VAProfileHEVCMain:    cid=ADM_coreLibVA::configH265;break;
-       case VAProfileHEVCMain10:  cid=ADM_coreLibVA::configH26510Bits;break;       
-#endif       
+       case VAProfileHEVCMain10:  cid=ADM_coreLibVA::configH26510Bits;break;
+#endif
 #ifdef LIBVA_VP9_DEC
-       case VAProfileVP9Profile3: cid=ADM_coreLibVA::configVP9;break;       
+       case VAProfileVP9Profile3: cid=ADM_coreLibVA::configVP9;break;
 #endif
        default:
                 ADM_assert(0);
@@ -545,7 +554,7 @@
     }
 
     CHECK_ERROR(vaCreateContext ( ADM_coreLibVA::display, cid,
-                width,    height,    
+                width,    height,
                 VA_PROGRESSIVE, // ?? NOT SURE ??
                 surfaces,
                 nbSurface,
@@ -563,14 +572,14 @@
  * \brief allocate the correct image type for transfer : None, YV12 or NV12
  * @param w
  * @param h
- * @return 
+ * @return
  */
  VAImage    *admLibVA::allocateImage( int w, int h)
  {
     switch(ADM_coreLibVA::transferMode)
     {
     case   admLibVA::ADM_LIBVA_NONE: ADM_warning("No transfer supported\n");
-    case   admLibVA::ADM_LIBVA_DIRECT:        
+    case   admLibVA::ADM_LIBVA_DIRECT:
                 return NULL;break;
     case   admLibVA::ADM_LIBVA_INDIRECT_NV12:
                 return admLibVA::allocateNV12Image(w,h);break;
@@ -582,10 +591,10 @@
  }
 
 /**
- * 
+ *
  * @param w
  * @param h
- * @return 
+ * @return
  */
 VAImage   *admLibVA::allocateNV12Image( int w, int h)
 {
@@ -594,7 +603,7 @@
     VAImage *image=new VAImage;
     memset(image,0,sizeof(*image));
     CHECK_ERROR(vaCreateImage ( ADM_coreLibVA::display, &ADM_coreLibVA::imageFormatNV12,
-                w,    h,    
+                w,    h,
                 image));
     if(xError)
     {
@@ -606,10 +615,10 @@
     return image;
 }
 /**
- * 
+ *
  * @param w
  * @param h
- * @return 
+ * @return
  */
 VAImage   *admLibVA::allocateYV12Image( int w, int h)
 {
@@ -618,7 +627,7 @@
     VAImage *image=new VAImage;
     memset(image,0,sizeof(*image));
     CHECK_ERROR(vaCreateImage ( ADM_coreLibVA::display, &ADM_coreLibVA::imageFormatYV12,
-                w,    h,    
+                w,    h,
                 image));
     if(xError)
     {
@@ -630,7 +639,7 @@
     return image;
 }
 /**
- * 
+ *
  * @param surface
  */
 void        admLibVA::destroyImage(  VAImage *image)
@@ -643,7 +652,7 @@
         ADM_assert(0);
     }
     listOfAllocatedVAImage.erase(image->image_id);
-    
+
     CHECK_ERROR(vaDestroyImage(ADM_coreLibVA::display, image->image_id));
     delete image;
     if(xError)
@@ -659,10 +668,10 @@
  */
 bool admLibVA::destroyDecoder(VAContextID session)
 {
-       
+
        int xError;
        CHECK_WORKING(false);
-       
+
        aprintf("Destroying decoder %x\n",session);
         CHECK_ERROR(vaDestroyContext(ADM_coreLibVA::display,session));
         if(!xError)
@@ -678,16 +687,16 @@
  * \fn allocateSurface
  * @param w
  * @param h
- * @return 
+ * @return
  */
 VASurfaceID        admLibVA::allocateSurface(int w, int h)
 {
        int xError;
        CHECK_WORKING(VA_INVALID);
-       
+
        aprintf("Creating surface %d x %d\n",w,h);
        VASurfaceID s;
- 
+
         CHECK_ERROR(vaCreateSurfaces(ADM_coreLibVA::display,
                         VA_RT_FORMAT_YUV420,
                         w,h,
@@ -705,7 +714,7 @@
             }
             listOfAllocatedSurface[s]=true;
             return s;
-        }        
+        }
         aprintf("Error creating surface\n");
         return VA_INVALID;
 }
@@ -718,7 +727,7 @@
 {
       int xError;
       CHECK_WORKING();
-      
+
       surfaceList::iterator already;
       already=listOfAllocatedSurface.find(surface);
       if(already==listOfAllocatedSurface.end())
@@ -740,7 +749,7 @@
  * \fn surfaceToImage
  * @param id
  * @param img
- * @return 
+ * @return
  */
 bool        admLibVA::surfaceToAdmImage(ADMImage *dest,ADM_vaSurface *src)
 {
@@ -763,7 +772,7 @@
      }
      if(status==VASurfaceReady) break;
      countDown--;
-     if(!countDown) 
+     if(!countDown)
      {
          ADM_warning("Timeout waiting for surface\n");
          return false;
@@ -784,14 +793,14 @@
     {
         case VA_FOURCC_YV12:break;
         case VA_FOURCC_NV12:break;
-        default:  
+        default:
             ADM_warning("Unknown format %s\n",fourCC_tostring(vaImage.format.fourcc));
             goto dropIt;
     }
     // Map image...
-     
+
     CHECK_ERROR(vaMapBuffer(ADM_coreLibVA::display, vaImage.buf, (void**)&ptr))
-    if(!xError)        
+    if(!xError)
     {
          switch(vaImage.format.fourcc)
         {
@@ -811,17 +820,17 @@
                     dest->convertFromNV12(ptr+vaImage.offsets[0],ptr+vaImage.offsets[1], vaImage.pitches[0], vaImage.pitches[1]);
                     break;
                 }
-                default:  
+                default:
                     goto dropIt;
                     break;
         }
         r=true;
         CHECK_ERROR(vaUnmapBuffer(ADM_coreLibVA::display, vaImage.buf))
     }
-dropIt:    
+dropIt:
     CHECK_ERROR(vaDestroyImage (ADM_coreLibVA::display,vaImage.image_id));
-    
-    
+
+
     return r;
 }
 /**
@@ -830,7 +839,7 @@
  * @param widget
  * @param displayWidth
  * @param displayHeight
- * @return 
+ * @return
  */
 bool        admLibVA::putX11Surface(ADM_vaSurface *img,int widget,int displayWidth,int displayHeight)
 {
@@ -853,7 +862,7 @@
  */
 bool   admLibVA::imageToSurface(VAImage *src, ADM_vaSurface *dst)
 {
-    
+
     int xError;
     VASurfaceStatus status;
     CHECK_WORKING(false);
@@ -877,12 +886,12 @@
  */
 bool   admLibVA::surfaceToImage(ADM_vaSurface *dst,VAImage *src )
 {
-    
+
     int xError;
     VASurfaceStatus status;
     CHECK_WORKING(false);
     CHECK_ERROR(vaGetImage(ADM_coreLibVA::display,
-                           dst->surface,                           
+                           dst->surface,
                            0,0,
                            dst->w,dst->h,
                            src->image_id
@@ -899,7 +908,7 @@
  * \fn uploadToImage
  * @param dest
  * @param src
- * @return 
+ * @return
  */
 bool   admLibVA::uploadToImage( ADMImage *src,VAImage *dest)
 {
@@ -908,7 +917,7 @@
     CHECK_WORKING(false);
     uint8_t *ptr=NULL;
     CHECK_ERROR(vaMapBuffer(ADM_coreLibVA::display, dest->buf, (void**)&ptr))
-    if(xError)        
+    if(xError)
     {
         ADM_warning("Cannot map image\n");
         return false;
@@ -929,7 +938,7 @@
         case VA_FOURCC_NV12:src->convertToNV12(  ptr+dest->offsets[0], ptr+dest->offsets[1],dest->pitches[0],dest->pitches[1]);break;
         default: ADM_assert(0);
     }
-    CHECK_ERROR(vaUnmapBuffer (ADM_coreLibVA::display,dest->buf));    
+    CHECK_ERROR(vaUnmapBuffer (ADM_coreLibVA::display,dest->buf));
     return true;
 }
 
@@ -937,7 +946,7 @@
  * \fn uploadToImage
  * @param dest
  * @param src
- * @return 
+ * @return
  */
 bool   admLibVA::downloadFromImage( ADMImage *src,VAImage *dest)
 {
@@ -946,7 +955,7 @@
     CHECK_WORKING(false);
     uint8_t *ptr=NULL;
     CHECK_ERROR(vaMapBuffer(ADM_coreLibVA::display, dest->buf, (void**)&ptr))
-    if(xError)        
+    if(xError)
     {
         ADM_warning("Cannot map image\n");
         return false;
@@ -970,7 +979,7 @@
                         break;
         default: ADM_assert(0);
     }
-    CHECK_ERROR(vaUnmapBuffer (ADM_coreLibVA::display,dest->buf));    
+    CHECK_ERROR(vaUnmapBuffer (ADM_coreLibVA::display,dest->buf));
     return true;
 }
 /**
@@ -979,7 +988,7 @@
  * @param dest
  * @param src
  */
-static void  copyNV12(uint8_t *ptr, VAImage *dest, ADMImage *src) 
+static void  copyNV12(uint8_t *ptr, VAImage *dest, ADMImage *src)
 {
           int w=src->_width;
 
@@ -994,7 +1003,7 @@
                 s+=srcStride;
                 d+=dstStride;
          }
-         
+
         w=w/2;
         h=h/2;
         uint8_t *srcu=src->GetReadPtr(PLANAR_U);
@@ -1008,15 +1017,15 @@
                 uint8_t *ssrcu=srcu;
                 uint8_t *ssrcv=srcv;
                 uint8_t *d=dstPtr;
-                
+
                 srcu+=uStride;
                 srcv+=vStride;
                 dstPtr+=dstStride;
 
                 for(int x=0;x<w;x++)
                 {
-                    d[0]=*ssrcu++;
-                    d[1]=*ssrcv++;
+                    d[0]=*ssrcv++;
+                    d[1]=*ssrcu++;
                     d+=2;
                 }
         }
@@ -1025,7 +1034,7 @@
  * \fn uploadToSurface
  * @param src
  * @param dest
- * @return 
+ * @return
  */
 bool   admLibVA:: admImageToSurface( ADMImage *src,ADM_vaSurface *dest)
 {
@@ -1034,7 +1043,7 @@
     VASurfaceStatus status;
     CHECK_WORKING(false);
     uint8_t *ptr=NULL;
-    
+
     VAImage vaImage;
     CHECK_ERROR(vaDeriveImage (ADM_coreLibVA::display, dest->surface,&vaImage));
     if(xError)
@@ -1047,7 +1056,7 @@
     {
         case VA_FOURCC_YV12:break;
         case VA_FOURCC_NV12:break;
-        default:  
+        default:
             ADM_warning("Unknown format %s\n",fourCC_tostring(vaImage.format.fourcc));
             goto dontTry;
     }
@@ -1055,13 +1064,13 @@
     // Map image...
 
     CHECK_ERROR(vaMapBuffer(ADM_coreLibVA::display, vaImage.buf, (void**)&ptr))
-    if(!xError)        
+    if(!xError)
     {
          r=true;
          // NV12 or YV12
         switch(vaImage.format.fourcc)
         {
-            case VA_FOURCC_YV12: 
+            case VA_FOURCC_YV12:
                 {
                 ADMImageRefWrittable ref(src->_width,src->_height);
                 for(int i=0;i<3;i++)
@@ -1072,31 +1081,31 @@
                 ref.duplicate(src);
                 }
                 break;
-            case VA_FOURCC_NV12: 
+            case VA_FOURCC_NV12:
                 copyNV12(ptr,&vaImage,src);
                 break;
-            default:  
+            default:
                 ADM_warning("Unknown format %s\n",fourCC_tostring(vaImage.format.fourcc));
                 break;
         }
         CHECK_ERROR(vaUnmapBuffer(ADM_coreLibVA::display, vaImage.buf))
     }
-dontTry:    
+dontTry:
     CHECK_ERROR(vaDestroyImage (ADM_coreLibVA::display,vaImage.image_id));
-    
+
     return r;
 }
 /**
- * 
+ *
  * @param image
- * @return 
+ * @return
  */
 bool ADM_vaSurface::fromAdmImage (ADMImage *dest)
 {
     switch(ADM_coreLibVA::transferMode)
     {
     case   admLibVA::ADM_LIBVA_NONE: ADM_warning("No transfer supported\n");return false;break;
-    case   admLibVA::ADM_LIBVA_DIRECT:   
+    case   admLibVA::ADM_LIBVA_DIRECT:
                 //printf("Direct\n");
                 return admLibVA::admImageToSurface (dest,this);
     case   admLibVA::ADM_LIBVA_INDIRECT_NV12:
@@ -1112,30 +1121,50 @@
     return false;
 }
 /**
- * 
+ * allocateWithSurface
+ * @param w
+ * @param h
  * @return 
  */
+ADM_vaSurface *ADM_vaSurface::allocateWithSurface(int w,int h)
+{
+    ADM_vaSurface *s=new ADM_vaSurface(w,h);
+    s->surface=admLibVA::allocateSurface(w,h);
+    if(!s->hasValidSurface())
+    {
+        delete s;
+        s=NULL;
+        ADM_warning("Cannot allocate va surface\n");
+        return NULL;
+    }
+    return s;
+}
+
+/**
+ *
+ * @return
+ */
 bool ADM_vaSurface_cleanupCheck(void)
 {
     int n=listOfAllocatedSurface.size();
     if(!n) return true;
-    
+
     ADM_warning("Some allocated va surface are still in use (%d), clearing them\n");
     return true;
-    
+
 }
 /**
- * 
- * @return 
+ *
+ * @return
  */
 bool ADM_vaImage_cleanupCheck(void)
 {
     int n=listOfAllocatedVAImage.size();
     if(!n) return true;
-    
+
     ADM_warning("Some allocated va images are still in use (%d), clearing them\n");
     return true;
-    
+
 }
 /**
  * \fn admLibVa_exitCleanup
@@ -1151,16 +1180,16 @@
 }
 
 /**
- * 
+ *
  * @param image
- * @return 
+ * @return
  */
 bool ADM_vaSurface::toAdmImage(ADMImage *dest)
 {
     switch(ADM_coreLibVA::transferMode)
     {
     case   admLibVA::ADM_LIBVA_NONE: ADM_warning("No transfer supported\n");return false;break;
-    case   admLibVA::ADM_LIBVA_DIRECT:   
+    case   admLibVA::ADM_LIBVA_DIRECT:
                 //printf("Direct\n");
                 return admLibVA::surfaceToAdmImage(dest,this);
     case   admLibVA::ADM_LIBVA_INDIRECT_NV12:
@@ -1175,10 +1204,60 @@
     }
     return false;
 }
+/**
+ * 
+ * @return 
+ */
+VAConfigID  admLibVA::createFilterConfig()
+{
+      VAStatus xError;
+      VAConfigID id=VA_INVALID;
+      
+      if(!coreLibVAWorking) {ADM_warning("Libva not operationnal\n");return VA_INVALID;}
+      
+      CHECK_ERROR(vaCreateConfig(ADM_coreLibVA::display, VAProfileNone, VAEntrypointVideoProc, 0, 0, &id));
+      if(xError!=VA_STATUS_SUCCESS)
+          return VA_INVALID;
+      return id;
+}
 
+/**
+ * 
+ * @return 
+ */
+VAContextID admLibVA::createFilterContext()
+{
+    return VA_INVALID;
+}
+/**
+ * 
+ * @param id
+ * @return 
+ */
+bool        admLibVA::destroyFilterContext(VAContextID &id)
+{
+     VAStatus xError;
+     if(!coreLibVAWorking) {ADM_warning("Libva not operationnal\n");return false;}
+    
+    CHECK_ERROR( vaDestroyContext(ADM_coreLibVA::display, id));
+    id=VA_INVALID;
+    return true;
+}
+
+/**
+ * 
+ * @return 
+ */
+bool        admLibVA::destroyFilterConfig(VAConfigID &id)
+{
+    VAStatus xError;
+     if(!coreLibVAWorking) {ADM_warning("Libva not operationnal\n");return false;}
+    
+    CHECK_ERROR( vaDestroyConfig(ADM_coreLibVA::display, id));
+    id=VA_INVALID;
+    return true;
+}
 
 
 #include "ADM_coreLibVA_encoder.cpp"
 #endif
-
-

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_encoder.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_encoder.cpp Changed

@@ -6,28 +6,25 @@
  */
 ADM_vaEncodingBuffer::ADM_vaEncodingBuffer(ADM_vaEncodingContext *context,int bufferSize)
 {
-        int xError;
-        CHECK_ERROR(vaCreateBuffer(ADM_coreLibVA::display,context->contextId,VAEncCodedBufferType,
-                                   bufferSize, 1, NULL, &bufferId));
-        if(xError)
-        {
-            ADM_warning("Cannot create encoding buffer\n");
-            bufferId=VA_INVALID;
-        }
-
-        
+    int xError;
+    CHECK_ERROR(vaCreateBuffer(ADM_coreLibVA::display,context->contextId,VAEncCodedBufferType,
+                               bufferSize, 1, NULL, &bufferId));
+    if(xError)
+    {
+        ADM_warning("Cannot create encoding buffer\n");
+        bufferId=VA_INVALID;
+    }   
 }
 /**
  * \fn dtor
  */
 ADM_vaEncodingBuffer::~ADM_vaEncodingBuffer()
 {
-        if(bufferId!=VA_INVALID)
-        {
-              vaDestroyBuffer(ADM_coreLibVA::display,bufferId);
-              bufferId=VA_INVALID;
-        }
-        
+    if(bufferId!=VA_INVALID)
+    {
+          vaDestroyBuffer(ADM_coreLibVA::display,bufferId);
+          bufferId=VA_INVALID;
+    }        
 }
 
 /**
@@ -116,31 +113,30 @@
 {
         int xError;
         CHECK_WORKING(false);
-#if 0
-        
+#if 0        
         VAEncSequenceParameterBufferH264 seq_h264 = {0};
         VABufferID seq_param_buf;
             
-            seq_h264.level_idc = 30;
-            seq_h264.picture_width_in_mbs = width16/16;
-            seq_h264.picture_height_in_mbs = width16/16;
-            seq_h264.bits_per_second = 8000000; // bps
-            seq_h264.frame_rate = 30; // fps
-            seq_h264.initial_qp = 20;
-            seq_h264.min_qp = 1;
-            seq_h264.basic_unit_size = 0;
-            seq_h264.intra_period = 50;
-            
-            CHECK_ERROR(vaCreateBuffer(ADM_coreLibVA::display, contextId,
-                                       VAEncSequenceParameterBufferType,
-                                       sizeof(seq_h264),1,&seq_h264,&seq_param_buf));
-            if(xError) return false;
-            CHECK_ERROR (vaRenderPicture(ADM_coreLibVA::display, contextId, &seq_param_buf, 1));
-            if(xError) return false;
-            return true;
-#endif
-            return false;
+        seq_h264.level_idc = 30;
+        seq_h264.picture_width_in_mbs = width16/16;
+        seq_h264.picture_height_in_mbs = width16/16;
+        seq_h264.bits_per_second = 8000000; // bps
+        seq_h264.frame_rate = 30; // fps
+        seq_h264.initial_qp = 20;
+        seq_h264.min_qp = 1;
+        seq_h264.basic_unit_size = 0;
+        seq_h264.intra_period = 50;
 
+        CHECK_ERROR(vaCreateBuffer(ADM_coreLibVA::display, contextId,
+                                   VAEncSequenceParameterBufferType,
+                                   sizeof(seq_h264),1,&seq_h264,&seq_param_buf));
+        if(xError) return false;
+        CHECK_ERROR (vaRenderPicture(ADM_coreLibVA::display, contextId, &seq_param_buf, 1));
+        if(xError) return false;
+        return true;
+#else
+        return false;
+#endif        
 }
 /**
  * \fn encode
@@ -243,26 +239,39 @@
         ADM_warning("H264 encoding not supported\n");
         return false;
     }
+    for(int i=0;i<surfaceCount;i++)
+        if(!surfaces[i]->hasValidSurface())
+        {
+            ADM_warning("Surface %d is invalid\n",i);
+            return false;
+        }
+    
+    
      width16=(width+15)&~15;
      height16=(height+15)&~15;
      
-     internalSurface[0]=new ADM_vaSurface(width16,height16);
-     internalSurface[1]=new ADM_vaSurface(width16,height16);
+     internalSurface[0]=ADM_vaSurface::allocateWithSurface(width16,height16);
+     internalSurface[1]=ADM_vaSurface::allocateWithSurface(width16,height16);
+
      if(!internalSurface[0] || !internalSurface[1])
      {
-         ADM_warning("Cannot allocate internal surface\n");
+         ADM_warning("Cannot allocate internal images\n");
          return false;
      }
+
+
      
      VASurfaceID *s=new VASurfaceID[surfaceCount+2];
      for(int i=0;i<surfaceCount;i++)
          s[i]=surfaces[i]->surface;
      s[surfaceCount]=internalSurface[0]->surface;
      s[surfaceCount+1]=internalSurface[1]->surface;
-     CHECK_ERROR(vaCreateContext(ADM_coreLibVA::display,  ADM_coreLibVAEnc::encoders::vaH264.configId,
-                                width16, height16,
-                                VA_PROGRESSIVE,
-                                 s,surfaceCount+2,&contextId));
+     CHECK_ERROR(vaCreateContext(ADM_coreLibVA::display,  
+                                 ADM_coreLibVAEnc::encoders::vaH264.configId,
+                                 width16, height16,
+                                 VA_PROGRESSIVE,
+                                 s,
+                                 surfaceCount+2,&contextId));
      delete [] s;
      if(xError)
      {
@@ -272,3 +281,5 @@
      aprintf("Context created ok\n");
      return true;
  }
+// EOF
+ 
\ No newline at end of file

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoDecoderInternal.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoDecoderInternal.h Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderInternal.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderInternal.h Changed

@@ -88,8 +88,8 @@
 // Macros to declare audio encoder
 /**************************************************************************/
 #define ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(Class) \
-static bool getConfigurationData (CONFcouple **c); \
-static bool setConfigurationData (CONFcouple *c,bool full=true);\
+static bool xgetConfigurationData (CONFcouple **c); \
+static bool xsetConfigurationData (CONFcouple *c,bool full=true);\
 \
 static ADM_coreVideoEncoder * create (ADM_coreVideoFilter * head,bool globalHeader) \
 { \
@@ -113,31 +113,31 @@
     configure,\
     setProfile,\
     getProfile, \
-    getConfigurationData,\
-    setConfigurationData,\
+    xgetConfigurationData,\
+    xsetConfigurationData,\
     resetConfigurationData,\
     probe,\
     uiType,\
     maj,minV,patch,\
     NULL\
 };\
-bool getConfigurationData (CONFcouple **c)\
+bool xgetConfigurationData (CONFcouple **c)\
 {\
          if(confTemplate==NULL) {*c=NULL;return true;} \
          return ADM_paramSave(c,confTemplate,confVar); \
 }\
-bool setConfigurationData (CONFcouple *c,bool full)\
+bool xsetConfigurationData (CONFcouple *c,bool full)\
 {\
 	if(full) return ADM_paramLoad(c,confTemplate,confVar); \
 	return ADM_paramLoadPartial(c,confTemplate,confVar); \
 } \
-extern "C" ADM_videoEncoderDesc *getInfo (void) \
+extern "C" ADM_PLUGIN_EXPORT ADM_PLUGIN_EXPORT ADM_videoEncoderDesc *getInfo (void) \
 { \
   return &encoderDesc; \
 }  \
 
 #define ADM_DECLARE_VIDEO_ENCODER_MAIN(name,menuName,desc,configure,uiType,maj,minV,patch,confTemplate,confVar,setProfile,getProfile) \
-extern "C" bool probe (void) \
+extern "C" ADM_PLUGIN_EXPORT bool probe (void) \
 { \
   return true; \
 }  \

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterInternal.h -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterInternal.h Changed

@@ -13,7 +13,7 @@
 
 class ADM_coreVideoFilter;
 
-#define VF_API_VERSION 8
+#define VF_API_VERSION 9
 
 /**
     \struct admVideoFilterInfo
@@ -69,49 +69,49 @@
 
 #define DECLARE_VIDEO_FILTER_INTERNAL(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc,Partializable) \
     extern "C" { \
-    ADM_coreVideoFilter *create(ADM_coreVideoFilter *previous,CONFcouple *conf)\
+    ADM_PLUGIN_EXPORT ADM_coreVideoFilter *create(ADM_coreVideoFilter *previous,CONFcouple *conf)\
     { \
         return new Class(previous,conf);\
     } \
-    void *destroy(ADM_coreVideoFilter *codec) \
+    ADM_PLUGIN_EXPORT void *destroy(ADM_coreVideoFilter *codec) \
     { \
         Class *a=(Class *)codec;\
         delete a;\
         return NULL;\
     }\
-    int supportedUI(void) \
+    ADM_PLUGIN_EXPORT int supportedUI(void) \
     { \
         return UI & ADM_UI_MASK; \
     } \
-        int neededFeatures(void) \
+        ADM_PLUGIN_EXPORT int neededFeatures(void) \
     { \
         return UI & ADM_FEATURE_MASK; \
     } \
-    uint32_t getApiVersion(void)\
+    ADM_PLUGIN_EXPORT uint32_t getApiVersion(void)\
     {\
             return VF_API_VERSION;\
     }\
-    bool getFilterVersion(uint32_t *major,uint32_t *minor, uint32_t *patch)\
+    ADM_PLUGIN_EXPORT bool getFilterVersion(uint32_t *major,uint32_t *minor, uint32_t *patch)\
     {\
         *major=Major;\
         *minor=Minor;\
         *patch=Patch;\
         return true;\
     }\
-    const char *getDesc(void)\
+    ADM_PLUGIN_EXPORT const char *getDesc(void)\
     {\
         return Desc; \
     }\
-    const char *getInternalName(void)\
+    ADM_PLUGIN_EXPORT const char *getInternalName(void)\
     {\
         return internalName; \
     }\
-    const char *getDisplayName(void)\
+    ADM_PLUGIN_EXPORT const char *getDisplayName(void)\
     {\
         return displayName; \
     }\
-    bool partializable() { return Partializable;} \
-    VF_CATEGORY getCategory(void) \
+    ADM_PLUGIN_EXPORT bool partializable() { return Partializable;} \
+    ADM_PLUGIN_EXPORT VF_CATEGORY getCategory(void) \
     { \
         return category;\
     }\

avidemux_2.6.15.tar.gz/avidemux_core/ADM_coreVideoFilter/src/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_core/ADM_coreVideoFilter/src/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_core/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_core/CMakeLists.txt Changed

@@ -28,6 +28,8 @@
 include(admMainChecks)
 include(admCheckFtello)
 include(admAsNeeded)
+INCLUDE(admCheckVDPAU)
+INCLUDE(admCheckLibVA)
 
 #########################################
 # Debug Summary
@@ -57,6 +59,19 @@
 PRINT_LIBRARY_INFO("SQLite" SQLITE_FOUND "${SQLITE_INCLUDE_DIR}" "${SQLITE_LIBRARY_DIR}" FATAL_ERROR)
 MESSAGE("")
 
+############################################"
+# Check for DXVA2
+# We do it here, cmake messes things up when
+# we use try_compile later on, so do it once here
+############################################"
+
+IF(WIN32)# AND NOT MSVC)
+   INCLUDE(admCheckDxva2)
+ELSE(WIN32)
+        checkVDPAU()
+        checkLibVA()
+ENDIF(WIN32)# AND NOT MSVC)
+
 ########################################
 # Generate config.h
 ########################################
@@ -70,7 +85,6 @@
 ########################################
 set(EXCLUDE_ADM_INCLUDE TRUE)
 include(admCoreIncludes)
-
 ########################################
 # Build FFmpeg
 ########################################
@@ -145,5 +159,13 @@
 # 
 
 INSTALL(FILES ${CMAKE_BINARY_DIR}/config/ADM_coreConfig.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6" COMPONENT dev)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/config/ADM_coreConfig.cmake DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6" COMPONENT dev)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/config/ADM_coreConfig.cmake DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/cmake/" COMPONENT dev)
+
+IF(MSVC)
+        INSTALL(FILES ${CMAKE_SOURCE_DIR}/../foreignBuilds/msvc/include/stdint.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6" COMPONENT dev)
+        INSTALL(FILES ${CMAKE_SOURCE_DIR}/../foreignBuilds/msvc/include/inttypes.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6" COMPONENT dev)
+        INSTALL(FILES ${CMAKE_SOURCE_DIR}/../foreignBuilds/msvc/include/GL/glext.h  DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/GL" COMPONENT dev)
+ENDIF(MSVC)
+
+
 MESSAGE("")

avidemux_2.6.16.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-3.0.5.tar.bz2 Added

avidemux_2.6.16.tar.gz/avidemux_core/ffmpeg_package/patches/0001-configure-Don-t-require-nonfree-for-nvenc.patch Added

avidemux_2.6.15.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch -> avidemux_2.6.16.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch Changed

avidemux_2.6.16.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.c.patch Added

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt Changed

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_aac.cpp Added

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_ac3.cpp Added

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_dts.cpp Added

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_mp2.cpp Added

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfPlugin.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfPlugin.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsPlugin.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsPlugin.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxyAudio.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxyAudio.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_net.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_net.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flvPlugin.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flvPlugin.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvPlugin.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvPlugin.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Plugin.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Plugin.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudio.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudio.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psPlugin.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psPlugin.cpp Changed

@@ -31,7 +31,7 @@
     \fn Probe
 */
 
-extern "C"  uint32_t         probe(uint32_t magic, const char *fileName)
+extern "C" ADM_PLUGIN_EXPORT uint32_t         probe(uint32_t magic, const char *fileName)
 {
 char *index=(char *)malloc(strlen(fileName)+6);
 int count=0;
@@ -104,12 +104,14 @@
 */
 bool detectPs(const char *file)
 {
-    uint8_t buffer[PROBE_SIZE];
+    
     uint32_t bufferSize;
     uint32_t nbPacket,nbMatch=0;
 
     FILE *f=ADM_fopen(file,"rb");
     if(!f) return false;
+
+    uint8_t *buffer = new uint8_t[PROBE_SIZE];
     bufferSize=fread(buffer,1,PROBE_SIZE,f);
     fclose(f);
     nbPacket=bufferSize/2300;
@@ -118,10 +120,12 @@
     tail=buffer+bufferSize;
     uint8_t code;
     uint32_t offset;
+    bool r = false;
     // Is it a Seq Start ?
     if(!buffer[0] && !buffer[1] && buffer[2]==1 && buffer[3]==0xba)
     {
         printf("Starts with SEQUENCE_START, probably MpegPS\n");
+        delete[] buffer;
         return true;
     }
     while(ADM_findMpegStartCode(head,tail,&code,&offset))
@@ -130,8 +134,11 @@
         if(code==0xE0) nbMatch++;
     }
     printf(" match :%d / %d (probeSize:%d)\n",nbMatch,nbPacket,bufferSize);
-    if(nbMatch*10>nbPacket*2)
-        return true;
-    return false;
+    if (nbMatch * 10 > nbPacket * 2)
+    {
+        r = true;
+    }
+    delete[] buffer;
+    return r;
 }
 //EOF

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPlugin.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPlugin.cpp Changed

@@ -32,7 +32,7 @@
     \fn Probe
 */
 
-extern "C"  uint32_t         probe(uint32_t magic, const char *fileName)
+extern "C"  uint32_t ADM_PLUGIN_EXPORT        probe(uint32_t magic, const char *fileName)
 {
 char *index=(char *)malloc(strlen(fileName)+6);
 int count=0;
@@ -104,27 +104,30 @@
 */
 bool detectTs(const char *file)
 {
-    uint8_t buffer[PROBE_SIZE];
     uint32_t bufferSize;
     uint32_t nbPacket,nbMatch=0;
 
     FILE *f=ADM_fopen(file,"rb");
     if(!f) return false;
+    uint8_t *buffer=new uint8_t[PROBE_SIZE];
     bufferSize=fread(buffer,1,PROBE_SIZE,f);
     fclose(f);
     // Do a simple check by checking we have 0x47....0x47 several time in a raw
     if(true==checkMarker(buffer,bufferSize,TS_PACKET_LEN))
     {
         ADM_info("[TS Demuxer] 188 bytes packet detected\n");
+        delete [] buffer;
         return true;
     }
     // Do a simple check by checking we have 0x47....0x47 several time in a raw
     if(true==checkMarker(buffer,bufferSize,TS_PACKET_LEN+4))
     {
         ADM_info("[TS Demuxer] 192 bytes packet detected\n");
+        delete [] buffer;
         return true;
     }
     ADM_info("[TS Demuxer] Not a TS file\n");
+    delete [] buffer;
     return false;
 }

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/Mxf/ADM_mxfPlugin.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/Mxf/ADM_mxfPlugin.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_odml.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_odml.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLPlugin.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLPlugin.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/Pictures/ADM_picPlugin.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/Pictures/ADM_picPlugin.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsPlugin.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsPlugin.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_muxers/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_muxers/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/platform.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/platform.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexMuxer.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexMuxer.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyTests.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyTests.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp Changed

@@ -12,7 +12,9 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#ifndef _MSC_VER
 #include <libgen.h>
+#endif
 #include "ADM_assert.h"
 #include "ADM_pyAvidemux.h"
 #include "PythonEngine.h"
@@ -83,6 +85,9 @@
 
 extern "C"
 {
+#ifdef _MSC_VER
+__declspec(dllexport)
+#endif
 	IScriptEngine* createEngine()
 	{
 		return new PythonEngine();
@@ -336,7 +341,16 @@
 	TinyParams pm(tp);
         const char *path = pm.asString();
 	char *copy=strdup(path);
+#ifdef _MSC_VER
+        char fname[2048]={0};
+        char fext[50]={0};
+        char b[2048]={0};
+        _splitpath(copy,NULL,NULL,fname,fext);
+        strcpy(b,fname);
+        strcat(b,fext);
+#else
         char *b=::basename(copy);
+#endif
         tp_obj r;
         if(!b)
         {
@@ -355,8 +369,16 @@
 	TinyParams pm(tp);
         const char *path = pm.asString();
         char *copy=strdup(path);
-        
+#ifdef _MSC_VER
+        char dir[2048]={0};
+        char drive[50]={0};
+        char b[2048]={0};
+        _splitpath(copy,drive,dir,NULL,NULL);
+        strcpy(b,drive);
+        strcat(b,dir);
+#else
         char *b=::dirname(copy);
+#endif
         tp_obj r;
         if(!b)
         {

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/TinyParams.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/TinyParams.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoEncoder/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoEncoder/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoEncoder/libva/ADM_libvaEncoder.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoEncoder/libva/ADM_libvaEncoder.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoEncoder/libva/ADM_libvaEncoder.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoEncoder/libva/ADM_libvaEncoder.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp Changed

@@ -122,6 +122,8 @@
         connect(ui.quantiserSlider, SIGNAL(valueChanged(int)), this, SLOT(quantiserSlider_valueChanged(int)));
         connect(ui.meSlider, SIGNAL(valueChanged(int)), this, SLOT(meSlider_valueChanged(int)));
         connect(ui.quantiserSpinBox, SIGNAL(valueChanged(int)), this, SLOT(quantiserSpinBox_valueChanged(int)));
+        connect(ui.maxBFramesSpinBox, SIGNAL(valueChanged(int)), this, SLOT(maxBFramesSpinBox_valueChanged(int)));
+        connect(ui.bFrameRefComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(bFrameRefComboBox_currentIndexChanged(int)));
         connect(ui.meSpinBox, SIGNAL(valueChanged(int)), this, SLOT(meSpinBox_valueChanged(int)));
         connect(ui.targetRateControlSpinBox, SIGNAL(valueChanged(int)), this, SLOT(targetRateControlSpinBox_valueChanged(int)));
         connect(ui.cuTreeCheckBox, SIGNAL(toggled(bool)), this, SLOT(cuTreeCheckBox_toggled(bool)));
@@ -634,10 +636,48 @@
 {
 	ui.meSpinBox->setValue(value);
 }
+
 void x265Dialog::quantiserSpinBox_valueChanged(int value)
 {
 	ui.quantiserSlider->setValue(value);
 }
+
+void x265Dialog::maxBFramesSpinBox_valueChanged(int value)
+{
+    // HEVC specification allows a maximum of 8 total reference frames only if B frames are disabled.
+    // Enforce the limit to ensure compliance.
+    if(!value)
+    {
+        ui.refFramesSpinBox->setMaximum(8);
+    }else // with B frames enabled, the maximum decreases to 7
+    {
+        if(ui.bFrameRefComboBox->currentIndex()>0)
+        { // max ref frames decreases further to 6 if B pyramid is enabled as well
+            ui.refFramesSpinBox->setMaximum(6);
+        }else
+        {
+            ui.refFramesSpinBox->setMaximum(7);
+        }
+    }
+}
+
+void x265Dialog::bFrameRefComboBox_currentIndexChanged(int index)
+{
+     if(ui.maxBFramesSpinBox->value()) // if B frames are enabled
+     {
+         if(index>0) // and B pyramid is enabled too, reduce max ref frames accordingly
+         {
+             ui.refFramesSpinBox->setMaximum(6);
+         }else
+         {
+             ui.refFramesSpinBox->setMaximum(7);
+         }
+     }else
+     {
+         ui.refFramesSpinBox->setMaximum(8);
+     }
+}
+
 void x265Dialog::meSpinBox_valueChanged(int value)
 {
 	ui.meSlider->setValue(value);

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters/Clean/ADM_vidClean.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters/Clean/ADM_vidClean.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters/Srt/ADM_vidSRTload.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters/Srt/ADM_vidSRTload.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters/Srt/DIA_flySrtPos.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters/Srt/DIA_flySrtPos.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters/Srt/qt4/Q_srt.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters/Srt/qt4/Q_srt.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt Changed

@@ -1,12 +1,18 @@
-ADD_SUBDIRECTORY(asciiView)
+IF(NOT MSVC)
+        ADD_SUBDIRECTORY(asciiView)
+        ADD_SUBDIRECTORY(colorYUV)
+        ADD_SUBDIRECTORY(fluxSmooth)
+        ADD_SUBDIRECTORY(telecide)
+ENDIF(NOT MSVC)
+
+
 ADD_SUBDIRECTORY(addBorder)
 ADD_SUBDIRECTORY(asharp)
 ADD_SUBDIRECTORY(ass)
-#ADD_SUBDIRECTORY(avsfilter)
+ADD_SUBDIRECTORY(avsfilter)
 ADD_SUBDIRECTORY(black)
 ADD_SUBDIRECTORY(blackenBorder)
 ADD_SUBDIRECTORY(changeFps)
-ADD_SUBDIRECTORY(colorYUV)
 ADD_SUBDIRECTORY(contrast)
 ADD_SUBDIRECTORY(chromaShift)
 ADD_SUBDIRECTORY(crop)
@@ -18,7 +24,6 @@
 ADD_SUBDIRECTORY(fadeTo)
 ADD_SUBDIRECTORY(fastConvolution)
 ADD_SUBDIRECTORY(fields)
-ADD_SUBDIRECTORY(fluxSmooth)
 ADD_SUBDIRECTORY(horizontalFlip)
 ADD_SUBDIRECTORY(hue)
 ADD_SUBDIRECTORY(ivtcDupeRemover)
@@ -38,7 +43,9 @@
 ADD_SUBDIRECTORY(rotate)
 ADD_SUBDIRECTORY(stackField)
 ADD_SUBDIRECTORY(swapUV)
-ADD_SUBDIRECTORY(telecide)
 ADD_SUBDIRECTORY(yadif)
+IF(USE_LIBVA AND DO_COMMON)
+        ADD_SUBDIRECTORY(vaapiFilters)
+ENDIF(USE_LIBVA AND DO_COMMON)
 ADD_SUBDIRECTORY(vdpauFilters)
 ADD_SUBDIRECTORY(verticalFlip)

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.h Changed

@@ -1,13 +1,11 @@
 
-
-#ifndef FLY_ASHARP_H
-#define FLY_ASHARP_H
+#pragma once
 /**
     \class flyASharp
 */
 #include "asharp.h"
 #define uc uint8_t
-class flyASharp : public FLY_DIALOG_TYPE
+class flyASharp : public ADM_flyDialogYuv
 {
   
   public:
@@ -18,9 +16,9 @@
    uint8_t    download(void);
    uint8_t    upload(void);
    uint8_t    update(void);
-   flyASharp (uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
-                                    void *canvas, void *slider) : 
-                FLY_DIALOG_TYPE(width, height,in,canvas, slider,1,RESIZE_AUTO) {};
+                flyASharp (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, QSlider *slider) : 
+                    ADM_flyDialogYuv(parent,width, height,in,canvas, slider,RESIZE_AUTO) {};
 };
 
 void asharp_run_c(      uc* planeptr, int pitch,
@@ -28,4 +26,4 @@
                                         int     T,int D, int B, int B2, bool bf,uint8_t *line );
 
 
-#endif
+

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui Changed

@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>asharpDialog</class>
- <widget class="QDialog" name="asharpDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="asharpDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,34 +10,31 @@
     <height>454</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>ASharp</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
+  <layout class="QGridLayout">
+   <property name="leftMargin">
     <number>9</number>
    </property>
-   <property name="topMargin" >
+   <property name="topMargin">
     <number>9</number>
    </property>
-   <property name="rightMargin" >
+   <property name="rightMargin">
     <number>9</number>
    </property>
-   <property name="bottomMargin" >
+   <property name="bottomMargin">
     <number>9</number>
    </property>
-   <property name="horizontalSpacing" >
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
-   <item row="3" column="3" >
+   <item row="2" column="3">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
@@ -44,12 +42,12 @@
      </property>
     </spacer>
    </item>
-   <item row="2" column="3" >
+   <item row="1" column="3">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
@@ -57,12 +55,12 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="3" >
+   <item row="0" column="3">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
@@ -70,12 +68,22 @@
      </property>
     </spacer>
    </item>
-   <item row="0" column="3" >
+   <item row="1" column="2">
+    <widget class="QDoubleSpinBox" name="doubleSpinBoxStrength"/>
+   </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QCheckBox" name="checkBox">
+     <property name="text">
+      <string>Unknown flag</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="3">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
@@ -83,62 +91,55 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="0" colspan="4" >
-    <widget class="QSlider" name="horizontalSlider" >
-     <property name="orientation" >
+   <item row="5" column="0" colspan="4">
+    <widget class="QSlider" name="horizontalSlider">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="6" column="1" colspan="3" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Block Adaptative</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="4" >
-    <widget class="QGraphicsView" name="graphicsView" />
-   </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
-      <string>Strength</string>
+   <item row="7" column="1" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+   <item row="2" column="2">
+    <widget class="QDoubleSpinBox" name="doubleSpinBoxBlock"/>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
       <string>Threshold</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QLabel" name="label_3" >
-     <property name="text" >
-      <string>Block Adaptative</string>
-     </property>
-    </widget>
+   <item row="6" column="0" colspan="4">
+    <widget class="QGraphicsView" name="graphicsView"/>
    </item>
-   <item row="3" column="0" colspan="3" >
-    <widget class="QCheckBox" name="checkBox" >
-     <property name="text" >
-      <string>Unknown flag</string>
+   <item row="0" column="2">
+    <widget class="QDoubleSpinBox" name="doubleSpinBoxTreshold"/>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Strength</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="2" >
-    <widget class="QDoubleSpinBox" name="doubleSpinBoxTreshold" />
-   </item>
-   <item row="1" column="2" >
-    <widget class="QDoubleSpinBox" name="doubleSpinBoxStrength" />
-   </item>
-   <item row="2" column="2" >
-    <widget class="QDoubleSpinBox" name="doubleSpinBoxBlock" />
+   <item row="4" column="0">
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
    </item>
   </layout>
  </widget>
@@ -150,11 +151,11 @@
    <receiver>asharpDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -166,11 +167,11 @@
    <receiver>asharpDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt Changed

@@ -1,24 +1,28 @@
-INCLUDE(admCheckFreeType)
-INCLUDE(admCheckFridibi)
-ADD_CORE_INCLUDE(ADM_coreSubtitles)
-checkFreeType()
-checkFridibi("0.19")
-
-IF (USE_FREETYPE AND USE_FRIDIBI)
-	ADD_SUBDIRECTORY(ADM_libass)
-
-	INCLUDE(vf_plugin)
-	SET(ADM_vf_ssa_SRCS ADM_vidASS.cpp)
-
-	ADD_VIDEO_FILTER(ADM_vf_ssa ${ADM_vf_ssa_SRCS})
-
-	IF(DO_COMMON)
-		TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIDIBI_LDFLAGS} ADM_coreSubtitle)
-                # We force the use of fontconfig
-                ADD_DEFINITIONS("-DUSE_FONTCONFIG")
-                TARGET_LINK_LIBRARIES(ADM_vf_ssa ${FONTCONFIG_LDFLAGS})
-	ENDIF(DO_COMMON)
-
-	INIT_VIDEO_FILTER(ADM_vf_ssa)
-	INSTALL_VIDEO_FILTER(ADM_vf_ssa)
-ENDIF (USE_FREETYPE AND USE_FRIDIBI)
+INCLUDE(admCheckFreeType)
+INCLUDE(admCheckFridibi)
+ADD_CORE_INCLUDE(ADM_coreSubtitles)
+checkFreeType()
+checkFridibi("0.19")
+
+IF (USE_FREETYPE AND USE_FRIDIBI)
+    INCLUDE(vf_plugin)
+    SET(ADM_vf_ssa_SRCS ADM_vidASS.cpp)
+
+    ADD_VIDEO_FILTER(ADM_vf_ssa ${ADM_vf_ssa_SRCS})
+
+    IF(DO_COMMON)
+        IF(USE_EXTERNAL_LIBASS)
+            ADD_DEFINITIONS("-DUSE_EXTERNAL_LIBASS")
+            TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES} ${FREETYPE2_LDFLAGS} ${FRIDIBI_LDFLAGS} ADM_coreSubtitle)
+        ELSE(USE_EXTERNAL_LIBASS)
+            ADD_SUBDIRECTORY(ADM_libass)
+            TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIDIBI_LDFLAGS} ADM_coreSubtitle)
+        ENDIF(USE_EXTERNAL_LIBASS)
+        # We force the use of fontconfig
+        ADD_DEFINITIONS("-DUSE_FONTCONFIG")
+        TARGET_LINK_LIBRARIES(ADM_vf_ssa ${FONTCONFIG_LDFLAGS})
+    ENDIF(DO_COMMON)
+
+    INIT_VIDEO_FILTER(ADM_vf_ssa)
+    INSTALL_VIDEO_FILTER(ADM_vf_ssa)
+ENDIF (USE_FREETYPE AND USE_FRIDIBI)

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.cpp Changed

@@ -56,28 +56,38 @@
   return true;
 }
 
-#define p(X) pp##X(int h, void *data, int sz)\
-{\
-  int copy_sz = 0;\
-  while (copy_sz != sz)\
-  {\
-    int isz = X(h, (char*)data + copy_sz,\
-                    ((sz - copy_sz) < PIPE_MAX_TRANSFER_SZ ? (sz - copy_sz) : PIPE_MAX_TRANSFER_SZ));\
-    if (isz == -1 || isz == 0) return -1;\
-    copy_sz += isz;\
-  }\
-  return copy_sz;\
+int ppread(int h, void *data, int sz)
+{
+  int copy_sz = 0;
+  while (copy_sz != sz)
+  {
+    int isz = read(h, (char*)data + copy_sz,
+                    ((sz - copy_sz) < PIPE_MAX_TRANSFER_SZ ? (sz - copy_sz) : PIPE_MAX_TRANSFER_SZ));
+    if (isz == -1 || isz == 0) return -1;
+    copy_sz += isz;
+  }
+  return copy_sz;
 }
 
-int p(write);
-int p(read);
+int ppwrite(int h, void *data, int sz)
+{
+  int copy_sz = 0;
+  while (copy_sz != sz)
+  {
+    int isz = write(h, (char*)data + copy_sz,
+                    ((sz - copy_sz) < PIPE_MAX_TRANSFER_SZ ? (sz - copy_sz) : PIPE_MAX_TRANSFER_SZ));
+    if (isz == -1 || isz == 0) return -1;
+    copy_sz += isz;
+  }
+  return copy_sz;
+}
 
 bool send_cmd(int hw, AVS_CMD cmd,
               const void *data, int sz)
 {
   PIPE_MSG_HEADER msg = {cmd, sz};
   return ((ppwrite(hw, &msg, sizeof(msg)) == sizeof(msg)) &&
-          (ppwrite(hw, data, sz) == sz));
+          (ppwrite(hw, (void*)data, sz) == sz));
 }
 
 bool send_cmd_with_specified_size(int hw, AVS_CMD cmd,

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/CMakeLists.txt Changed

@@ -3,22 +3,16 @@
 
 SET(chromaShiftCommon_SRCS 
 ADM_vidChromaShift.cpp
-DIA_flyChromaShift.cpp
 )
 # ---------- QT4 Version ----------------
 INCLUDE(vf_plugin_qt4)
 SET(chromaShiftQT_SRCS     qt4/Q_chromashift.cpp)
 SET(chromaShiftQT_HEADERS  qt4/Q_chromashift.h)
 SET(chromaShiftQT_UI       qt4/chromashift)
-INIT_VIDEO_FILTER_QT4(ADM_vf_chromaShift${QT_LIBRARY_EXTENSION} ${chromaShiftQT_SRCS} ${chromaShiftQT_HEADERS} ${chromaShiftQT_UI} ${chromaShiftCommon_SRCS})
+INIT_VIDEO_FILTER_QT4(ADM_vf_chromaShift${QT_LIBRARY_EXTENSION} ${chromaShiftQT_SRCS} ${chromaShiftQT_HEADERS} ${chromaShiftQT_UI} ${chromaShiftCommon_SRCS} DIA_flyChromaShift.cpp)
 # /QT4
 
 
-#------------- Gtk Version ---------------
-INCLUDE(vf_plugin_gtk)
-SET(chromaShiftGtk_SRCS gtk/DIA_chromaShift.cpp)
-INIT_VIDEO_FILTER_GTK(ADM_vf_chromaShiftGtk ${chromaShiftGtk_SRCS} ${chromaShiftCommon_SRCS})
-
 # ----------------- CLI Version -----------------------
 INCLUDE(vf_plugin_cli)
 SET(chromaShift_CLI_SRCS    cli/DIA_chromaShift.cpp)

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/cli/DIA_chromaShift.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/cli/DIA_chromaShift.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui Changed

@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>chromashiftDialog</class>
- <widget class="QDialog" name="chromashiftDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="chromashiftDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,51 +10,44 @@
     <height>585</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>ChromaShift</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
+  <layout class="QGridLayout">
+   <property name="leftMargin">
     <number>9</number>
    </property>
-   <property name="topMargin" >
+   <property name="topMargin">
     <number>9</number>
    </property>
-   <property name="rightMargin" >
+   <property name="rightMargin">
     <number>9</number>
    </property>
-   <property name="bottomMargin" >
+   <property name="bottomMargin">
     <number>9</number>
    </property>
-   <property name="horizontalSpacing" >
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
-      <string>V Shift</string>
-     </property>
-    </widget>
+   <item row="1" column="1">
+    <widget class="QSpinBox" name="spinBoxV"/>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
       <string>U Shift</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="3" >
+   <item row="5" column="3">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Maximum</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
@@ -61,38 +55,19 @@
      </property>
     </spacer>
    </item>
-   <item row="5" column="0" colspan="4" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="4" >
-    <widget class="QSlider" name="horizontalSlider" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>V Shift</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="4" >
-    <widget class="QGraphicsView" name="graphicsView" />
-   </item>
-   <item row="1" column="1" >
-    <widget class="QSpinBox" name="spinBoxV" />
-   </item>
-   <item row="0" column="1" >
-    <widget class="QSpinBox" name="spinBoxU" />
-   </item>
-   <item row="0" column="2" >
+   <item row="0" column="2">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
@@ -100,12 +75,28 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="2" >
+   <item row="0" column="1">
+    <widget class="QSpinBox" name="spinBoxU"/>
+   </item>
+   <item row="6" column="0" colspan="4">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="4">
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item row="1" column="2">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
@@ -113,6 +104,16 @@
      </property>
     </spacer>
    </item>
+   <item row="3" column="0" colspan="4">
+    <widget class="QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
   </layout>
  </widget>
  <resources/>
@@ -123,11 +124,11 @@
    <receiver>chromashiftDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -139,11 +140,11 @@
    <receiver>chromashiftDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp Changed

@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 #include <math.h>
-
-#include "DIA_flyDialog.h"
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
 #include "ADM_default.h"
 #include "ADM_coreVideoFilterInternal.h"
 #include "DIA_factory.h"
@@ -113,13 +113,12 @@
 */
 uint8_t buildContrastTable (float coef, int8_t off,  uint8_t * tableFlat, uint8_t * tableNZ)
 {
-  float f;
+  double f;
 
   for (uint32_t i = 0; i < 256; i++)
     {
       f = i;
       f *= coef;
-//                                      f= (f-128)*coef+128;
       f += off;
       if (f < 0.)
 	f = 0.;
@@ -130,9 +129,6 @@
       f = i;
       f -= 128;
       f *= coef;
-//                                      f= (f-128)*coef+128;
-
-//                                      f+=off;
       if (f < -127.)
 	f = -127.;
       if (f > 127.)
@@ -167,7 +163,7 @@
 /**
     \fn configure
 */
-bool DIA_getContrast( ADM_coreVideoFilter *instream,contrast    *param );
+extern bool DIA_getContrast( ADM_coreVideoFilter *instream,contrast    *param );
 bool ADMVideoContrast::configure( )
 
 {

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/CMakeLists.txt Changed

@@ -2,7 +2,7 @@
 INCLUDE(vf_plugin)
 
 SET(contrastCommon_SRCS 
-ADM_vidContrast.cpp  DIA_flyContrast.cpp
+ADM_vidContrast.cpp  
 )
 
 # ---------- QT4 Version ----------------
@@ -10,7 +10,7 @@
 SET(contrastQT_SRCS     qt4/Q_contrast.cpp)
 SET(contrastQT_HEADERS  qt4/Q_contrast.h)
 SET(contrastQT_UI       qt4/contrast)
-INIT_VIDEO_FILTER_QT4(ADM_vf_contrast${QT_LIBRARY_EXTENSION} ${contrastQT_SRCS} ${contrastQT_HEADERS} ${contrastQT_UI} ${contrastCommon_SRCS})
+INIT_VIDEO_FILTER_QT4(ADM_vf_contrast${QT_LIBRARY_EXTENSION} ${contrastQT_SRCS} ${contrastQT_HEADERS} ${contrastQT_UI} ${contrastCommon_SRCS} qt4/DIA_flyContrast.cpp)
 # /QT4
 
 
@@ -19,9 +19,5 @@
 SET(contrast_CLI_SRCS    cli/DIA_contrast.cpp)
 INIT_VIDEO_FILTER_CLI(ADM_vf_contrastCli ${contrast_CLI_SRCS} ${contrastCommon_SRCS})
 
-# ----------------- Gtk Version -----------------------
-INCLUDE(vf_plugin_gtk)
-SET(contrast_GTK_SRCS    cli/DIA_contrast.cpp)
-INIT_VIDEO_FILTER_GTK(ADM_vf_contrastGtk ${contrast_GTK_SRCS} ${contrastCommon_SRCS})
 # EOF

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/cli/DIA_contrast.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/cli/DIA_contrast.cpp Changed

@@ -15,21 +15,11 @@
  *                                                                         *
  ***************************************************************************/
 #include "ADM_image.h"
-#include "DIA_flyDialog.h"
 #include "../contrast.h"
 #include "DIA_factory.h"
-#include "../DIA_flyContrast.h"
+class ADM_coreVideoFilter;
 
 uint8_t DIA_getContrast( ADM_coreVideoFilter *instream,contrast    *param )
 {
-    diaElemToggle  u(&(param->doChromaU),QT_TRANSLATE_NOOP("contrast","U :"));
-    diaElemToggle  v(&(param->doChromaV),QT_TRANSLATE_NOOP("contrast","V :"));
-    diaElemToggle  l(&(param->doLuma),QT_TRANSLATE_NOOP("contrast","L :"));
-
-    diaElemInteger  o(&(param->offset),QT_TRANSLATE_NOOP("contrast","Offset :"),-127,127);
-    diaElemFloat    c(&(param->coef),QT_TRANSLATE_NOOP("contrast","Coef :"),-10,10);
-    diaElem *elems[]={&c,&o,&l,&u,&v};
-    return diaFactoryRun("Contrast",sizeof(elems)/sizeof(diaElem *),elems);
+    return true;
 }
-uint8_t    flyContrast::download(void) {return 1;}
-uint8_t    flyContrast::upload(void) {return 1;}

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.cpp Added

@@ -0,0 +1,112 @@
+/***************************************************************************
+                          ADM_guiContrast.cpp  -  description
+                             -------------------
+    begin                : Mon Sep 23 2002
+    copyright            : (C) 2002 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+
+#include "ADM_vidContrast.h"
+#include "contrast.h"
+
+#include "DIA_flyContrast.h"
+#include "QGraphicsScene"
+
+/************* COMMON PART *********************/
+uint8_t  flyContrast::update(void)
+{
+    return 1;
+}
+// Ugly !
+static uint8_t tableluma[256], tablechroma[256];
+/**
+    \fn processYuv
+*/
+uint8_t    flyContrast::processYuv(ADMImage* in, ADMImage *out)
+{
+    buildContrastTable (param.coef, param.offset, tableluma, tablechroma);
+
+
+    out->copyInfo(in);
+    if(!previewActivated)
+    {
+        out->copyPlane(in,out,PLANAR_Y);
+        out->copyPlane(in,out,PLANAR_U);
+        out->copyPlane(in,out,PLANAR_V);
+    }
+    else
+    {
+        if(param.doLuma)
+            doContrast(in,out,tableluma,PLANAR_Y);
+        else
+            out->copyPlane(in,out,PLANAR_Y);
+
+
+        if(param.doChromaU)
+            doContrast(in,out,tablechroma,PLANAR_U);
+        else
+            out->copyPlane(in,out,PLANAR_U);
+
+        if(param.doChromaV)
+            doContrast(in,out,tablechroma,PLANAR_V);
+        else
+            out->copyPlane(in,out,PLANAR_V);
+    }
+    if(!scene) return true;
+    
+    // Draw luma histogram
+    uint8_t *luma=out->GetReadPtr(PLANAR_Y);
+    int     stride=out->GetPitch(PLANAR_Y);
+    int     decimate=4;
+    double  sumsum[256];    
+    for(int i=0;i<256;i++) sumsum[i]=0;
+    
+    double  totalSum=(double)(out->_width*out->_height)/decimate; // # of sampling points
+    for(int y=0;y<in->_height;y+=decimate)
+    {
+        uint8_t *p=luma;
+        for(int x=0;x<in->_width;x++)
+        {
+            sumsum[*p]++;
+            p++;
+        }
+        luma+=stride*decimate;
+    }
+    // normalize
+    for(int i=0;i<256;i++)
+    {
+        // zoom factor =10
+        sumsum[i]=(10*sumsum[i]*(127))/totalSum;
+        if(sumsum[i]>127) sumsum[i]=127;
+    }
+    int toggle=0;
+    
+    scene->clear();
+    for(int i=0;i<256;i++)
+    {
+        QLineF qline(i,127,i,127-sumsum[i]);
+        scene->addLine(qline);
+    }
+    // Draw 16 and 235 line
+        QLineF qline(16,100,16,126);
+        scene->addLine(qline);
+        QLineF qline2(235,100,235,126);
+        scene->addLine(qline2);
+    
+    return 1;
+}
+/************* COMMON PART *********************/
+//EOF
+

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.h Added

@@ -0,0 +1,45 @@
+/***************************************************************************
+                          ADM_vidContrast.cpp  -  description
+                             -------------------
+    begin                : Sun Sep 22 2002
+    copyright            : (C) 2002 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#pragma once
+#include "contrast.h"
+class QGraphicsScene;
+/**
+    \class flyContrast
+*/
+class flyContrast : public ADM_flyDialogYuv
+{
+  public:
+   contrast     param;
+   QGraphicsScene *scene;
+   bool          previewActivated;
+   
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    void       setState(bool a){previewActivated=a;}
+   uint8_t    download(void);
+   uint8_t    upload(void);
+   uint8_t    update(void);
+                flyContrast (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, QSlider *slider,QGraphicsScene*sc) 
+                : ADM_flyDialogYuv(parent,width, height,in,canvas, slider,RESIZE_AUTO) 
+                {
+                  scene=sc;
+                  previewActivated=true;
+                };
+};
+

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp Changed

@@ -2,9 +2,9 @@
                           DIA_crop.cpp  -  description
                              -------------------
 
-			    GUI for cropping including autocrop
-			    +Revisted the Gtk2 way
-			     +Autocrop now in RGB space (more accurate)
+                            GUI for cropping including autocrop
+                            +Revisted the Gtk2 way
+                             +Autocrop now in RGB space (more accurate)
 
     begin                : Fri May 3 2002
     copyright            : (C) 2002/2007 by mean
@@ -37,73 +37,140 @@
         height=in->getInfo()->height;
 
         canvas=new ADM_QCanvas(ui.graphicsView,width,height);
-        
-        myCrop=new flyContrast( width, height,in,canvas,ui.horizontalSlider);
+
+        scene=new QGraphicsScene(this);
+        ui.graphicsViewHistogram->setScene(scene);
+        ui.graphicsViewHistogram->scale(1.0,1.0);
+
+        myCrop=new flyContrast( this,width, height,in,canvas,ui.horizontalSlider,scene);
         memcpy(&(myCrop->param),param,sizeof(contrast));
         myCrop->_cookie=&ui;
+        myCrop->addControl(ui.toolboxLayout);
         myCrop->upload();
         myCrop->sliderChanged();
 
+        previewState=true;
+        ui.checkBox_Enabled->setChecked(true);
+
 
         connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
-#define SPINNER(x) connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
+#define SPINNER(x) connect( ui.dial##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
           SPINNER(Brightness);
           SPINNER(Contrast);
+          
+        QString title=QString("Contrast: %1 %").arg((int)(100*myCrop->param.coef));
+        QString title2=QString("Brightness: %2").arg(myCrop->param.offset);
+        ui.labelContrast->setText(title);
+        ui.labelBrightness->setText(title2);
+          
           connect( ui.checkBoxU,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
           connect( ui.checkBoxV,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int))); 
           connect( ui.checkBoxY,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));  
+          connect( ui.checkBox_Enabled,SIGNAL(stateChanged(int)),this,SLOT(previewActivated(int)));  
+          connect( ui.toolButton__DVD2PC,SIGNAL(pressed()),this,SLOT(dvd2PC()));  
 
   }
+/**
+ * 
+ * @param foo
+ */  
   void Ui_contrastWindow::sliderUpdate(int foo)
   {
     myCrop->sliderChanged();
   }
+/**
+ * 
+ * @param param
+ */  
   void Ui_contrastWindow::gather(contrast *param)
   {
-    
+
         myCrop->download();
         memcpy(param,&(myCrop->param),sizeof(contrast));
   }
+  /**
+   * 
+   */
 Ui_contrastWindow::~Ui_contrastWindow()
 {
   if(myCrop) delete myCrop;
   myCrop=NULL; 
   if(canvas) delete canvas;
   canvas=NULL;
+  scene=NULL;
+}
+
+void Ui_contrastWindow::dvd2PC()
+{
+   if(lock) return;
+  lock++;
+  myCrop->param.coef=1.16;
+  myCrop->param.offset=-16;
+  myCrop->upload();
+  myCrop->sameImage();
+  QString title=QString("Contrast: %1 %").arg((int)(100*myCrop->param.coef));
+  QString title2=QString("Brightness: %2").arg(myCrop->param.offset);
+  ui.labelContrast->setText(title);
+  ui.labelBrightness->setText(title2);
+  lock--;
 }
+/**
+ * 
+ * @param a
+ */
+void Ui_contrastWindow::previewActivated(int a)
+{
+    previewState=a;
+    myCrop->setState(a);
+    myCrop->sameImage();
+}
+/**
+ * 
+ * @param f
+ */
 void Ui_contrastWindow::valueChanged( int f )
 {
   if(lock) return;
   lock++;
   myCrop->download();
   myCrop->sameImage();
+  QString title=QString("Contrast: %1 %").arg((int)(100*myCrop->param.coef));
+  QString title2=QString("Brightness: %2").arg(myCrop->param.offset);
+  ui.labelContrast->setText(title);
+  ui.labelBrightness->setText(title2);
   lock--;
 }
 
-#define MYSPIN(x) w->horizontalSlider##x
+#define MYSPIN(x) w->dial##x
 #define MYCHECK(x) w->checkBox##x
-//************************
+/**
+ * 
+ * @return 
+ */
 uint8_t flyContrast::upload(void)
 {
       Ui_contrastDialog *w=(Ui_contrastDialog *)_cookie;
 
-        MYSPIN(Contrast)->setValue((uint32_t)(param.coef*10));
+        MYSPIN(Contrast)->setValue((uint32_t)(param.coef*100));
         MYSPIN(Brightness)->setValue(param.offset);
 #define CHECKSET(a,b) MYCHECK(a)->setChecked(param.b)
-        
+
         CHECKSET(Y,doLuma);
         CHECKSET(U,doChromaU);
         CHECKSET(V,doChromaV);
-
         return 1;
 }
+/**
+ * 
+ * @return 
+ */
 uint8_t flyContrast::download(void)
 {
        Ui_contrastDialog *w=(Ui_contrastDialog *)_cookie;
-         param.coef=MYSPIN(Contrast)->value()/10.;
+         param.coef=MYSPIN(Contrast)->value()/100.;
          param.offset=MYSPIN(Brightness)->value();
 #define CHECKGET(a,b) param.b=MYCHECK(a)->isChecked()
-        
+
         CHECKGET(Y,doLuma);
         CHECKGET(U,doChromaU);
         CHECKGET(V,doChromaV);
@@ -114,21 +181,20 @@
       \fn     DIA_getCropParams
       \brief  Handle crop dialog
 */
-uint8_t DIA_getContrast(ADM_coreVideoFilter *in,contrast *param)
+bool DIA_getContrast(ADM_coreVideoFilter *in,contrast *param)
 {
-        uint8_t ret=0;
-        Ui_contrastWindow dialog(qtLastRegisteredDialog(), param,in);
-		qtRegisterDialog(&dialog);
-
-        if(dialog.exec()==QDialog::Accepted)
-        {
-            dialog.gather(param); 
-            ret=1;
-        }
-
-		qtUnregisterDialog(&dialog);
-
-        return ret;
+    uint8_t ret=0;
+    Ui_contrastWindow dialog(qtLastRegisteredDialog(), param,in);
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+    return ret;
 }
 //____________________________________
 // EOF

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h Changed

@@ -1,10 +1,25 @@
-#ifndef Q_contrast_h
-#define Q_contrast_h
-#include "DIA_flyDialog.h"
+/***************************************************************************
+                          ADM_vidContrast.cpp  -  description
+                             -------------------
+    begin                : Sun Sep 22 2002
+    copyright            : (C) 2002 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
 #include "ui_contrast.h"
 #include "ADM_image.h"
 #include "DIA_flyDialogQt4.h"
 #include "DIA_flyContrast.h"
+#include "QGraphicsScene"
 /**
     \class Ui_contrastWindow
 */
@@ -14,6 +29,8 @@
 
 protected : 
 	int lock;
+        QGraphicsScene *scene;
+        bool            previewState;
 
 public:
 	flyContrast *myCrop;
@@ -28,5 +45,6 @@
 private slots:
 	void sliderUpdate(int foo);
 	void valueChanged(int foo);
+        void previewActivated(int a);
+        void dvd2PC();
 };
-#endif	// Q_contrast_h

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui Changed

@@ -1,183 +1,235 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>contrastDialog</class>
- <widget class="QDialog" name="contrastDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="contrastDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>558</width>
-    <height>390</height>
+    <width>650</width>
+    <height>514</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Contrast</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>6</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
-   <item row="3" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Ignored</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="0" colspan="3" >
-    <widget class="QGraphicsView" name="graphicsView" />
-   </item>
-   <item row="1" column="0" colspan="3" >
-    <widget class="QSlider" name="horizontalSlider" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="3" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <layout class="QVBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
-     </property>
+  <layout class="QFormLayout" name="formLayout">
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout_5">
      <item>
-      <widget class="QCheckBox" name="checkBoxY" >
-       <property name="text" >
-        <string>Luma</string>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <item>
+          <widget class="QLabel" name="labelContrast">
+           <property name="text">
+            <string>Contrast  </string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QDial" name="dialContrast">
+           <property name="toolTip">
+            <string>Contrast</string>
+           </property>
+           <property name="minimum">
+            <number>50</number>
+           </property>
+           <property name="maximum">
+            <number>150</number>
+           </property>
+           <property name="singleStep">
+            <number>1</number>
+           </property>
+           <property name="value">
+            <number>50</number>
+           </property>
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="notchTarget">
+            <double>2.000000000000000</double>
+           </property>
+           <property name="notchesVisible">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout_3">
+           <item>
+            <widget class="QLabel" name="labelBrightness">
+             <property name="text">
+              <string>Brightness  </string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDial" name="dialBrightness">
+             <property name="toolTip">
+              <string>Brightness</string>
+             </property>
+             <property name="minimum">
+              <number>-127</number>
+             </property>
+             <property name="maximum">
+              <number>127</number>
+             </property>
+             <property name="notchesVisible">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <layout class="QVBoxLayout">
+           <property name="spacing">
+            <number>6</number>
+           </property>
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QCheckBox" name="checkBoxU">
+             <property name="text">
+              <string>ChromaU</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="checkBoxV">
+             <property name="text">
+              <string>ChromaV</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="checkBoxY">
+             <property name="text">
+              <string>Luma</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="checkBox_Enabled">
+             <property name="text">
+              <string>Process</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QToolButton" name="toolButton__DVD2PC">
+           <property name="text">
+            <string>MPEG2-&gt;PC</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGraphicsView" name="graphicsViewHistogram">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>256</width>
+           <height>128</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>256</width>
+           <height>256</height>
+          </size>
+         </property>
+         <property name="verticalScrollBarPolicy">
+          <enum>Qt::ScrollBarAlwaysOff</enum>
+         </property>
+         <property name="horizontalScrollBarPolicy">
+          <enum>Qt::ScrollBarAlwaysOff</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QCheckBox" name="checkBoxU" >
-       <property name="text" >
-        <string>ChromaU</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="checkBoxV" >
-       <property name="text" >
-        <string>ChromaV</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="0" >
-    <layout class="QVBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>Contrast</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="horizontalSliderContrast" >
-       <property name="minimum" >
-        <number>5</number>
-       </property>
-       <property name="maximum" >
-        <number>15</number>
-       </property>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
-        <string>Brightness</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="horizontalSliderBrightness" >
-       <property name="minimum" >
-        <number>-127</number>
-       </property>
-       <property name="maximum" >
-        <number>127</number>
-       </property>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
+        <widget class="QSlider" name="horizontalSlider">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="toolboxLayout"/>
+       </item>
+       <item>
+        <widget class="QGraphicsView" name="graphicsView"/>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
-   <item row="0" column="2" >
-    <spacer>
-     <property name="orientation" >
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
-    </spacer>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -189,11 +241,11 @@
    <receiver>contrastDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -205,11 +257,11 @@
    <receiver>contrastDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/cli/DIA_crop.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/cli/DIA_crop.cpp Changed

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.cpp Added

@@ -0,0 +1,234 @@
+/***************************************************************************
+                          DIA_flyCrop.cpp  -  description
+                             -------------------
+
+        Common part of the crop dialog
+    
+    copyright            : (C) 2002/2007 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyCrop.h"
+
+
+static uint8_t 		Metrics( uint8_t *in, uint32_t width,uint32_t *avg, uint32_t *eqt);
+static uint8_t 		MetricsV( uint8_t *in, uint32_t width,uint32_t height,uint32_t *avg, uint32_t *eqt);
+/**
+    \fn process
+	\brief 
+*/
+uint8_t    flyCrop::processRgb(uint8_t *imageIn, uint8_t *imageOut)
+{
+        uint32_t x,y;
+        uint8_t  *in;
+        uint32_t w=_w,h=_h;
+  
+        
+        memcpy(imageOut,imageIn,_w*_h*4);
+        in=imageOut;
+        for(y=0;y<top;y++)
+        {
+                for(x=0;x<w;x++)
+                {
+                        *in++=0;
+                        
+                        
+                        *in++=0xff;
+                        
+                        *in++=0;
+                        *in++=0;
+                }
+        }
+        // bottom
+        in=imageOut+(w*4)*(h-bottom);
+        for(y=0;y<bottom;y++)
+        {
+                for(x=0;x<w;x++)
+                {
+                        *in++=0;
+                        
+                        
+                        *in++=0xff;
+                        *in++=0;
+                        *in++=0;
+                }
+        }
+        // left
+        in=imageOut;
+        uint32_t stride=4*w-4;
+        for(y=0;y<h;y++)
+        {
+                for(x=0;x<left;x++)
+                {
+                        *(in+4*x)=0;
+                        
+                        
+                        *(in+4*x+1)=0xff;
+                        *(in+4*x+2)=0;
+                        *(in+4*x+3)=0;
+                }
+                for(x=0;x<right;x++)
+                {
+                        *(in-4*x+stride-4)=0;
+                        
+                        
+                        *(in-4*x+stride-3)=0xff;
+                        *(in-4*x+stride-2)=0;
+                        *(in-4*x+stride-1)=0;
+                        
+                }
+                in+=4*w;
+  
+        }
+        return true;
+
+}
+
+/**
+     \fn autocrop
+	\brief 
+*/
+
+uint8_t  flyCrop::autocrop(void)
+{
+uint8_t *in;
+uint32_t y,avg,eqt;
+	// Top
+
+#define THRESH_AVG   30
+#define THRESH_EQT   50
+        
+        in=_yuvBuffer->GetReadPtr(PLANAR_Y);
+        for(y=0;y<((_h>>1)-2);y++)	
+        {
+                Metrics(in,_w,&avg,&eqt);
+                in+=_w;
+                //printf("LineT :%d avg: %d eqt: %d\n",y,avg,eqt);
+                if(avg> THRESH_AVG || eqt > THRESH_EQT)
+                        break;
+        }
+//gotcha_:	
+        if(y)
+                top=y-1;
+        else 
+                top=0;
+                
+        in=_yuvBuffer->GetReadPtr(PLANAR_Y)+_w*(_h-1);
+        for(y=0;y<((_h>>1)-2);y++)	
+        {
+                Metrics(in,_w,&avg,&eqt);
+                in-=_w;
+                //printf("Line B :%d avg: %d eqt: %d\n",y,avg,eqt);
+                if(avg> THRESH_AVG || eqt > THRESH_EQT)
+                                break;
+        }
+//gotcha_:	
+        if(y)
+                bottom=y-1;
+        else
+                bottom=0;
+
+                
+// Left
+        in=_yuvBuffer->GetReadPtr(PLANAR_Y);
+        for(y=0;y<((_w>>1)-2);y++)	
+        {
+                MetricsV(in,_w,_h,&avg,&eqt);
+                in++;
+                //printf("Line L :%d avg: %d eqt: %d\n",y,avg,eqt);
+                if(avg> THRESH_AVG || eqt > THRESH_EQT)
+                                break;
+        }
+//gotcha_:	
+        if(y)
+                left=y-1;
+        else
+                left=0;		
+// Right
+        in=_yuvBuffer->GetReadPtr(PLANAR_Y)+_w-1;
+        for(y=0;y<((_w>>1)-2);y++)	
+        {
+                MetricsV(in,_w,_h,&avg,&eqt);
+                in--;
+                //printf("Line R :%d avg: %d eqt: %d\n",y,avg,eqt);
+                if(avg> THRESH_AVG || eqt > THRESH_EQT)
+                                break;
+        }
+//gotcha_:	
+        if(y)
+                right=y-1;
+        else
+                right=0;
+  
+              
+        // Update display
+        top=top & 0xfffe;
+        bottom=bottom & 0xfffe;
+        upload();
+        sameImage();
+        return 1;
+}
+/**
+     \fn Metrics
+	\brief Compute the average value of pixels	and eqt is the "ecart type"
+*/
+
+uint8_t Metrics( uint8_t *in, uint32_t width,uint32_t *avg, uint32_t *eqt)
+{
+
+uint32_t x;
+uint32_t sum=0,eq=0;
+uint8_t v;
+              for(x=0;x<width;x++)
+              {
+                      sum+=*(in+x);
+              }
+              sum=sum/width;
+              *avg=sum;
+              for(x=0;x<width;x++)
+              {
+                      v=*(in+x)-sum;
+                      eq+=v*v;
+              }
+              eq=eq/(width*width);
+              *eqt=eq;
+              return 1;
+}
+/**
+     \fn MetricsV
+	\brief Compute the average value of pixels	and eqt is the "ecart type"
+*/
+uint8_t MetricsV( uint8_t *in,uint32_t width, uint32_t height,uint32_t *avg, uint32_t *eqt)
+{
+
+uint32_t x;
+uint32_t sum=0,eq=0;
+uint8_t v;
+              for(x=0;x<height;x++)
+              {
+                      sum+=*(in+x*width);
+              }
+              sum=sum/height;
+              *avg=sum;
+              for(x=0;x<height;x++)
+              {
+                      v=*(in+x*width)-sum;
+                      eq+=v*v;
+              }
+              eq=eq/(height*height);
+              *eqt=eq;
+              return 1;
+}
+//EOF
+

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.h Added

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui Changed

@@ -1,62 +1,81 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>cropDialog</class>
- <widget class="QDialog" name="cropDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="cropDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>348</width>
+    <width>507</width>
     <height>300</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Crop</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
     <number>9</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
    </property>
    <item>
-    <layout class="QGridLayout" >
-     <property name="margin" >
+    <layout class="QGridLayout">
+     <property name="leftMargin">
       <number>0</number>
      </property>
-     <property name="spacing" >
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <property name="spacing">
       <number>6</number>
      </property>
-     <item row="0" column="3" >
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
+     <item row="0" column="3">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
         <string>Right:</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="label_4" >
-       <property name="text" >
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
         <string>Top:</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="4" >
-      <widget class="QSpinBox" name="spinBoxRight" >
-       <property name="maximum" >
+     <item row="0" column="4">
+      <widget class="QSpinBox" name="spinBoxRight">
+       <property name="maximum">
         <number>2147483647</number>
        </property>
       </widget>
      </item>
-     <item row="0" column="2" >
+     <item row="0" column="2">
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Fixed</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>26</width>
          <height>20</height>
@@ -64,12 +83,12 @@
        </property>
       </spacer>
      </item>
-     <item row="1" column="5" >
+     <item row="1" column="5">
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -77,50 +96,50 @@
        </property>
       </spacer>
      </item>
-     <item row="1" column="6" >
-      <widget class="QPushButton" name="pushButtonReset" >
-       <property name="text" >
+     <item row="1" column="6">
+      <widget class="QPushButton" name="pushButtonReset">
+       <property name="text">
         <string>Reset</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1" >
-      <widget class="QSpinBox" name="spinBoxTop" >
-       <property name="maximum" >
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="spinBoxTop">
+       <property name="maximum">
         <number>2147483647</number>
        </property>
       </widget>
      </item>
-     <item row="1" column="4" >
-      <widget class="QSpinBox" name="spinBoxBottom" >
-       <property name="maximum" >
+     <item row="1" column="4">
+      <widget class="QSpinBox" name="spinBoxBottom">
+       <property name="maximum">
         <number>2147483647</number>
        </property>
       </widget>
      </item>
-     <item row="1" column="3" >
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
+     <item row="1" column="3">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
         <string>Bottom:</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
         <string>Left:</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="5" >
+     <item row="0" column="5">
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::MinimumExpanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -128,29 +147,29 @@
        </property>
       </spacer>
      </item>
-     <item row="0" column="1" >
-      <widget class="QSpinBox" name="spinBoxLeft" >
-       <property name="maximum" >
+     <item row="0" column="1">
+      <widget class="QSpinBox" name="spinBoxLeft">
+       <property name="maximum">
         <number>2147483647</number>
        </property>
       </widget>
      </item>
-     <item row="0" column="6" >
-      <widget class="QPushButton" name="pushButtonAutoCrop" >
-       <property name="text" >
+     <item row="0" column="6">
+      <widget class="QPushButton" name="pushButtonAutoCrop">
+       <property name="text">
         <string>Auto Crop</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="2" >
+     <item row="1" column="2">
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Fixed</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>26</width>
          <height>20</height>
@@ -161,22 +180,25 @@
     </layout>
    </item>
    <item>
-    <widget class="QSlider" name="horizontalSlider" >
-     <property name="orientation" >
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="QSlider" name="horizontalSlider">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QGraphicsView" name="graphicsView" />
+    <widget class="QGraphicsView" name="graphicsView"/>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -201,11 +223,11 @@
    <receiver>cropDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -217,11 +239,11 @@
    <receiver>cropDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/decimate/decimate_util.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/decimate/decimate_util.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/cli/DIA_eq2.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/cli/DIA_eq2.cpp Changed

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.cpp Added

@@ -0,0 +1,79 @@
+/***************************************************************************
+                          ADM_guiContrast.cpp  -  description
+                             -------------------
+    begin                : Mon Sep 23 2002
+    copyright            : (C) 2002 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include <math.h>
+#include "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+
+#include "ADM_vidEq2.h"
+
+#include "DIA_flyEq2.h"
+typedef void lutMeType(oneSetting *par, ADMImage *i,ADMImage *o,ADM_PLANE plane);
+
+/************* COMMON PART *********************/
+uint8_t  flyEq2::update(void)
+{
+    return 1;
+}
+/**
+    \fn process
+*/
+uint8_t    flyEq2::processYuv(ADMImage* in, ADMImage *out)
+{
+	Eq2Settings mySettings;
+
+#if 0
+	printf("Contrast   :%f\n",param.contrast);
+	printf("brightness :%f\n",param.brightness);
+	printf("saturation :%f\n",param.saturation);
+	
+	printf("gamma_weight :%f\n",param.gamma_weight);
+	printf("gamma :%f\n",param.gamma);
+	
+	
+	
+	printf("rgamma :%f\n",param.rgamma);
+	printf("bgamma :%f\n",param.bgamma);
+	printf("ggamma :%f\n",param.ggamma);
+	printf("******************\n");
+#endif	
+	
+	        update_lut(&mySettings,&param);
+	        
+
+
+			lutMeType *lutMe=apply_lut;
+			
+
+#ifdef ADM_CPU_X86
+	        if(CpuCaps::hasMMX())
+	        {
+	        		lutMe=affine_1d_MMX;
+	        }
+#endif	
+	        lutMe(&(mySettings.param[0]),in,out,PLANAR_Y);
+            lutMe(&(mySettings.param[2]),in,out,PLANAR_U);
+            lutMe(&(mySettings.param[1]),in,out,PLANAR_V);
+	        
+	        	
+#if 1
+	        in->copyLeftSideTo(out);
+#endif
+		return 1;
+}
+
+/************* COMMON PART *********************/

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.h Added

@@ -0,0 +1,35 @@
+
+/***************************************************************************
+                        flyDialog for Eq2-Gtk
+                        (C) Mean 2007
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef FLY_EQ2_H
+#define FLY_EQ2_H
+#include "ADM_vidEq2.h"
+class flyEq2 : public ADM_flyDialogYuv
+{
+  
+  public:
+   eq2         param;
+  public:
+   uint8_t    processYuv(ADMImage* in, ADMImage *out);
+   uint8_t    download(void);
+   uint8_t    upload(void);
+   uint8_t    update(void);
+   			  flyEq2 (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in, ADM_QCanvas *canvas, QSlider *slider) : 
+   			 ADM_flyDialogYuv(parent,width, height,in,canvas, slider,RESIZE_AUTO)
+                    {
+                      
+                    };
+};
+
+#endif

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui Changed

@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>eq2Dialog</class>
- <widget class="QDialog" name="eq2Dialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="eq2Dialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,57 +10,34 @@
     <height>560</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Contrast</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
+  <layout class="QGridLayout">
+   <property name="leftMargin">
     <number>9</number>
    </property>
-   <property name="topMargin" >
+   <property name="topMargin">
     <number>9</number>
    </property>
-   <property name="rightMargin" >
+   <property name="rightMargin">
     <number>9</number>
    </property>
-   <property name="bottomMargin" >
+   <property name="bottomMargin">
     <number>9</number>
    </property>
-   <property name="horizontalSpacing" >
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
-   <item row="5" column="0" colspan="3" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="3" >
-    <widget class="QSlider" name="horizontalSlider" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="3" >
-    <widget class="QGraphicsView" name="graphicsView" />
-   </item>
-   <item row="4" column="2" >
+   <item row="5" column="2">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Ignored</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
@@ -67,205 +45,222 @@
      </property>
     </spacer>
    </item>
-   <item row="0" column="1" >
-    <widget class="QLabel" name="label_4" >
-     <property name="text" >
-      <string>&lt;b>Gamma&lt;/b></string>
+   <item row="0" column="1">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>&lt;b&gt;Gamma&lt;/b&gt;</string>
      </property>
-     <property name="textFormat" >
+     <property name="textFormat">
       <enum>Qt::RichText</enum>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <layout class="QGridLayout" >
-     <property name="leftMargin" >
-      <number>0</number>
+   <item row="6" column="0" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="topMargin" >
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <layout class="QGridLayout">
+     <property name="leftMargin">
       <number>0</number>
      </property>
-     <property name="rightMargin" >
+     <property name="topMargin">
       <number>0</number>
      </property>
-     <property name="bottomMargin" >
+     <property name="rightMargin">
       <number>0</number>
      </property>
-     <property name="horizontalSpacing" >
-      <number>6</number>
+     <property name="bottomMargin">
+      <number>0</number>
      </property>
-     <property name="verticalSpacing" >
+     <property name="spacing">
       <number>6</number>
      </property>
-     <item row="4" column="0" >
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
         <string>Saturation</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
         <string>Brightness</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
         <string>Contrast</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0" >
-      <widget class="QSlider" name="horizontalSliderContrast" >
-       <property name="minimum" >
+     <item row="1" column="0">
+      <widget class="QSlider" name="horizontalSliderContrast">
+       <property name="minimum">
         <number>-200</number>
        </property>
-       <property name="maximum" >
+       <property name="maximum">
         <number>200</number>
        </property>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="3" column="0" >
-      <widget class="QSlider" name="horizontalSliderBrightness" >
-       <property name="minimum" >
+     <item row="3" column="0">
+      <widget class="QSlider" name="horizontalSliderBrightness">
+       <property name="minimum">
         <number>-100</number>
        </property>
-       <property name="maximum" >
+       <property name="maximum">
         <number>100</number>
        </property>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="5" column="0" >
-      <widget class="QSlider" name="horizontalSliderSaturation" >
-       <property name="maximum" >
+     <item row="5" column="0">
+      <widget class="QSlider" name="horizontalSliderSaturation">
+       <property name="maximum">
         <number>300</number>
        </property>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="tickInterval" >
+       <property name="tickInterval">
         <number>1</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="1" column="1" >
-    <layout class="QGridLayout" >
-     <property name="leftMargin" >
-      <number>0</number>
+   <item row="3" column="0" colspan="3">
+    <widget class="QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="topMargin" >
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <layout class="QGridLayout">
+     <property name="leftMargin">
       <number>0</number>
      </property>
-     <property name="rightMargin" >
+     <property name="topMargin">
       <number>0</number>
      </property>
-     <property name="bottomMargin" >
+     <property name="rightMargin">
       <number>0</number>
      </property>
-     <property name="horizontalSpacing" >
-      <number>6</number>
+     <property name="bottomMargin">
+      <number>0</number>
      </property>
-     <property name="verticalSpacing" >
+     <property name="spacing">
       <number>6</number>
      </property>
-     <item row="2" column="1" >
-      <widget class="QSlider" name="horizontalSliderGreen" >
-       <property name="maximum" >
+     <item row="2" column="1">
+      <widget class="QSlider" name="horizontalSliderGreen">
+       <property name="maximum">
         <number>300</number>
        </property>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="3" column="1" >
-      <widget class="QSlider" name="horizontalSliderBlue" >
-       <property name="maximum" >
+     <item row="3" column="1">
+      <widget class="QSlider" name="horizontalSliderBlue">
+       <property name="maximum">
         <number>300</number>
        </property>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="3" column="0" >
-      <widget class="QLabel" name="label_9" >
-       <property name="text" >
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_9">
+       <property name="text">
         <string>Blue</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="label_6" >
-       <property name="text" >
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
         <string>Red</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label_5" >
-       <property name="text" >
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
         <string>Initial</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="0" >
-      <widget class="QLabel" name="label_7" >
-       <property name="text" >
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
         <string>Weight</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1" >
-      <widget class="QSlider" name="horizontalSliderRed" >
-       <property name="maximum" >
+     <item row="1" column="1">
+      <widget class="QSlider" name="horizontalSliderRed">
+       <property name="maximum">
         <number>300</number>
        </property>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="label_8" >
-       <property name="text" >
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
         <string>Green</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1" >
-      <widget class="QSlider" name="horizontalSliderInitial" >
-       <property name="maximum" >
+     <item row="0" column="1">
+      <widget class="QSlider" name="horizontalSliderInitial">
+       <property name="maximum">
         <number>300</number>
        </property>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="4" column="1" >
-      <widget class="QSlider" name="horizontalSliderWeight" >
-       <property name="maximum" >
+     <item row="4" column="1">
+      <widget class="QSlider" name="horizontalSliderWeight">
+       <property name="maximum">
         <number>300</number>
        </property>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
     </layout>
    </item>
+   <item row="4" column="0" colspan="3">
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item row="2" column="0">
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
   </layout>
  </widget>
  <resources/>
@@ -276,11 +271,11 @@
    <receiver>eq2Dialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -292,11 +287,11 @@
    <receiver>eq2Dialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/CMakeLists.txt Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/cli/DIA_hue.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/cli/DIA_hue.cpp Changed

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.cpp Added

@@ -0,0 +1,66 @@
+/**/
+/***************************************************************************
+                          DIA_hue
+                             -------------------
+
+			   Ui for hue & sat
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyHue.h"
+
+#include "ADM_assert.h"
+// FIXME
+#ifndef M_PI
+#define M_PI    3.14159265358979323846
+#endif
+extern void HueProcess_C( uint8_t *udst, uint8_t *vdst, 
+                            uint8_t *usrc, uint8_t *vsrc, 
+                            int dststride, int srcstride,   
+                            int w, int h, float hue, float sat);
+
+/************* COMMON PART *********************/
+uint8_t  flyHue::update(void)
+{
+    return 1;
+}        
+/**
+    \fn processYuv
+*/
+uint8_t   flyHue::processYuv(ADMImage *in,ADMImage *out )
+{
+uint8_t *src,*dst;
+uint32_t stride;
+float hue,sat;
+    hue=param.hue*M_PI/180.;
+    sat=(100+param.saturation)/100.;
+    out->copyPlane(in,out,PLANAR_Y);
+   
+    // Do it!
+    HueProcess_C(out->GetWritePtr(PLANAR_V), out->GetWritePtr(PLANAR_U),
+                 in->GetReadPtr(PLANAR_V), in->GetReadPtr(PLANAR_U),
+                 out->GetPitch(PLANAR_U),in->GetPitch(PLANAR_U), // assume u&v pitches are =
+                 in->GetWidth(PLANAR_U),in->GetHeight(PLANAR_U),
+                 hue, sat);
+    // Copy half source to display
+    in->copyLeftSideTo(out);
+    out->printString(1,1,QT_TRANSLATE_NOOP("hue","Original"));
+    out->printString(in->GetWidth(PLANAR_Y)/24+1,1,QT_TRANSLATE_NOOP("hue","Processed"));
+
+    return 1;
+}
+//EOF

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.h Added

@@ -0,0 +1,35 @@
+/***************************************************************************
+  \fn     DIA_flyHue
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for hue & sat
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef FLY_HUE_H
+#define FLY_HUE_H
+#include "hue.h"
+/**
+    \class flyHue
+*/
+
+class flyHue : public ADM_flyDialogYuv
+{
+  
+  public:
+   hue  param;
+  public:
+   uint8_t    processYuv(ADMImage* in, ADMImage *out);
+   uint8_t    download(void);
+   uint8_t    upload(void);
+   uint8_t    update(void);
+   flyHue (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, QSlider *slider) : ADM_flyDialogYuv(parent,width, height,in,canvas, slider,RESIZE_AUTO) {};
+};
+#endif

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui Changed

@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>hueDialog</class>
- <widget class="QDialog" name="hueDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="hueDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,136 +10,136 @@
     <height>475</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Hue</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
+  <layout class="QGridLayout">
+   <property name="leftMargin">
     <number>9</number>
    </property>
-   <property name="topMargin" >
+   <property name="topMargin">
     <number>9</number>
    </property>
-   <property name="rightMargin" >
+   <property name="rightMargin">
     <number>9</number>
    </property>
-   <property name="bottomMargin" >
+   <property name="bottomMargin">
     <number>9</number>
    </property>
-   <property name="horizontalSpacing" >
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
-   <item row="4" column="0" colspan="3" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Ignored</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" colspan="3" >
-    <widget class="QSlider" name="horizontalSlider" >
-     <property name="orientation" >
+   <item row="2" column="0" colspan="3">
+    <widget class="QSlider" name="horizontalSlider">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="3" >
-    <widget class="QGraphicsView" name="graphicsView" />
-   </item>
-   <item row="0" column="0" >
-    <layout class="QVBoxLayout" >
-     <property name="spacing" >
+   <item row="0" column="0">
+    <layout class="QVBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
+     <property name="leftMargin">
       <number>0</number>
      </property>
-     <property name="topMargin" >
+     <property name="topMargin">
       <number>0</number>
      </property>
-     <property name="rightMargin" >
+     <property name="rightMargin">
       <number>0</number>
      </property>
-     <property name="bottomMargin" >
+     <property name="bottomMargin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
+      <widget class="QLabel" name="label_3">
+       <property name="text">
         <string>Hue</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QSlider" name="horizontalSliderHue" >
-       <property name="minimum" >
+      <widget class="QSlider" name="horizontalSliderHue">
+       <property name="minimum">
         <number>-90</number>
        </property>
-       <property name="maximum" >
+       <property name="maximum">
         <number>90</number>
        </property>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label_4" >
-       <property name="text" >
+      <widget class="QLabel" name="label_4">
+       <property name="text">
         <string>Saturation</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QSlider" name="horizontalSliderSaturation" >
-       <property name="minimum" >
+      <widget class="QSlider" name="horizontalSliderSaturation">
+       <property name="minimum">
         <number>-10</number>
        </property>
-       <property name="maximum" >
+       <property name="maximum">
         <number>10</number>
        </property>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
     </layout>
    </item>
+   <item row="0" column="1">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="0" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item row="4" column="2">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Ignored</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
   </layout>
  </widget>
  <resources/>
@@ -149,11 +150,11 @@
    <receiver>hueDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -165,11 +166,11 @@
    <receiver>hueDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/cli/logo_cli.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/cli/logo_cli.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui Changed

@@ -6,162 +6,171 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>549</width>
+    <width>603</width>
     <height>516</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Logo</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Image</string>
-       </property>
-      </widget>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QLabel" name="labelImageText">
+         <property name="text">
+          <string>Image</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelImage">
+         <property name="text">
+          <string>Image</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButtonSelect">
+         <property name="text">
+          <string>Select</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
      </item>
-     <item row="0" column="1">
-      <widget class="QLabel" name="labelImage">
-       <property name="minimumSize">
-        <size>
-         <width>360</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="QPushButton" name="pushButtonSelect">
-       <property name="text">
-        <string>Select</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>X</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QSpinBox" name="spinX">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="2">
-      <spacer name="spacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>110</width>
-         <height>18</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Y</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QSpinBox" name="spinY">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="2" rowspan="2">
-      <spacer name="spacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>38</width>
-         <height>29</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="3" column="0" rowspan="2">
-      <widget class="QLabel" name="label_4">
-       <property name="toolTip">
-        <string>Alpha will be ignored if the image has alpha channel (png in RGB)</string>
-       </property>
-       <property name="text">
-        <string>Alpha</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1" rowspan="2">
-      <widget class="QSpinBox" name="spinAlpha">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="2">
-      <spacer name="spacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>38</width>
-         <height>29</height>
-        </size>
-       </property>
-      </spacer>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>X</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="spinX">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Y</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="spinY">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_4">
+           <property name="toolTip">
+            <string>Alpha will be ignored if the image has alpha channel (png in RGB)</string>
+           </property>
+           <property name="text">
+            <string>Alpha</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="spinAlpha">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
-   <item>
+   <item row="1" column="0">
+    <spacer name="spacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>588</width>
+       <height>18</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0">
     <widget class="QSlider" name="horizontalSlider">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <widget class="QGraphicsView" name="graphicsView"/>
    </item>
-   <item>
+   <item row="4" column="0">
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item row="5" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>You can click in the image to set the logo approximatively</string>
      </property>
     </widget>
    </item>
-   <item>
+   <item row="6" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -174,7 +183,7 @@
      </property>
     </spacer>
    </item>
-   <item>
+   <item row="7" column="0">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/CMakeLists.txt Changed

@@ -1,3 +1,4 @@
+#
 INCLUDE(vf_plugin)
 
 MACRO(addDeps tgt)
@@ -8,25 +9,19 @@
 
 SET(mpdelogoCommon_SRCS 
 ADM_vidMPdelogo.cpp
-DIA_flyMpDelogo.cpp
 )
 # ---------- QT4 Version ----------------
 INCLUDE(vf_plugin_qt4)
-SET(mpdelogoQT_SRCS  qt4/Q_mpdelogo.cpp)
+SET(mpdelogoQT_SRCS  qt4/Q_mpdelogo.cpp )
 SET(mpdelogoQT_HEADERS  qt4/Q_mpdelogo.h)
 SET(mpdelogoQT_UI    qt4/mpdelogo)
 IF(DO_QT4)
-  INIT_VIDEO_FILTER_QT4(ADM_vf_mpdelogo${QT_LIBRARY_EXTENSION} ${mpdelogoQT_SRCS} ${mpdelogoQT_HEADERS} ${mpdelogoQT_UI} ${mpdelogoCommon_SRCS})
+  INIT_VIDEO_FILTER_QT4(ADM_vf_mpdelogo${QT_LIBRARY_EXTENSION} ${mpdelogoQT_SRCS} ${mpdelogoQT_HEADERS} ${mpdelogoQT_UI} ${mpdelogoCommon_SRCS} qt4/DIA_flyMpDelogo.cpp)
   addDeps(ADM_vf_mpdelogo${QT_LIBRARY_EXTENSION})
 ENDIF(DO_QT4)
 # /QT4
 
 
-#------------- Gtk Version ---------------
-#INCLUDE(vf_plugin_gtk)
-#SET(mpdelogoGtk_SRCS gtk/DIA_mpdelogo.cpp)
-#INIT_VIDEO_FILTER_GTK(ADM_vf_mpdelogoGtk ${mpdelogoGtk_SRCS} ${mpdelogoCommon_SRCS})
-
 #------------ Cli Version ----------------
 INCLUDE(vf_plugin_cli)
 SET(mpdelogoCli_SRCS cli/DIA_mpdelogo.cpp)

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/cli/DIA_mpdelogo.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/cli/DIA_mpdelogo.cpp Changed

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.cpp Added

@@ -0,0 +1,76 @@
+/**/
+/***************************************************************************
+                          DIA_flyMpDelogo
+                             -------------------
+
+                           Ui for MPlayer DeLogo filter
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/5 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+
+
+#include "delogo.h"
+#include "DIA_flyMpDelogo.h"
+#include "ADM_vidMPdelogo.h"
+
+
+/************* COMMON PART *********************/
+/**
+    \fn process
+*/
+uint8_t    flyMpDelogo::processYuv(ADMImage* in, ADMImage *out)
+{
+    out->duplicate(in);
+    if(preview)
+        MPDelogo::doDelogo(out, param.xoff, param.yoff,
+                             param.lw,  param.lh,param.band,param.show);        
+    else
+    {
+        uint8_t *y=out->GetWritePtr(PLANAR_Y);
+        int stride=out->GetPitch(PLANAR_Y);
+        int mx=param.lw+param.xoff;
+        int my=param.lh+param.yoff;
+        if(mx>=out->GetWidth(PLANAR_Y)) mx=out->GetWidth(PLANAR_Y)-1;
+        if(my>=out->GetHeight(PLANAR_Y)) my=out->GetHeight(PLANAR_Y)-1;
+        
+        
+        // hz
+        uint8_t *p=y+stride*param.yoff;
+        uint8_t *p2=y+stride*(my);
+        
+        uint8_t toggle=0;
+        for(int x=param.xoff;x<mx;x++)
+        {
+            *(p+x)=toggle;
+            toggle=0xff^toggle;
+            *(p2+x)=toggle;
+        }
+        // vz
+         p=y+stride*(param.yoff)+param.xoff;
+         p2=y+stride*(param.yoff)+mx;
+         
+         for(int yy=param.yoff;yy<my;yy++)
+         {
+            *(p)=toggle;
+            toggle=0xff^toggle;
+            *(p2)=toggle;
+            p+=stride;   p2+=stride;
+         }
+    }
+    return 1;
+}
+//EOF

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.h Added

@@ -0,0 +1,50 @@
+/***************************************************************************
+    copyright            : (C) 2011 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#ifndef FLY_MPDELOGO_H
+#define FLY_MPDELOGO_H
+/**
+    \class flyASharp
+*/
+#include "delogo.h"
+/**
+    \class flyMpDelogo
+*/
+class flyMpDelogo : public ADM_flyDialogYuv
+{
+  
+  public:
+   delogo      param;
+   bool        preview;
+  public:
+   uint8_t     processYuv(ADMImage* in, ADMImage *out);
+   uint8_t     download(void);
+   uint8_t     upload(void);
+               flyMpDelogo (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, QSlider *slider) : 
+                ADM_flyDialogYuv(parent,width, height,in,canvas, slider,RESIZE_AUTO) 
+                {};
+   virtual     ~flyMpDelogo() {};
+   bool         setXy(int x,int y);
+   bool         setPreview(bool onoff)
+                {
+                    preview=onoff;
+                    return true;
+                }
+};
+// EOF
+
+
+#endif

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.cpp Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.h -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.h Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui Changed

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp Changed

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters Added

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp Added

@@ -0,0 +1,334 @@
+/**
+    \brief vaapi filters
+    \author mean (C) 2016
+ *  Use vaapi transform API (i.e. resize/colorspace)
+ * (c) mean 2016
+ * 
+*/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_default.h"
+#include "ADM_coreLibVA.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_videoFilterCache.h"
+#include "DIA_factory.h"
+#include "vaapiFilter.h"
+#include "vaapiFilter_desc.cpp"
+
+
+
+
+#include "ADM_coreLibVA.h"
+//
+#define ADM_INVALID_FRAME_NUM 0x80000000
+#define ADM_NB_SURFACES 3
+
+/**
+    \class vaapiVideoFilter
+*/
+class vaapiVideoFilter : public  ADM_coreVideoFilterCached
+{
+protected:
+                    ADMColorScalerSimple *scaler;
+                    ADM_vaSurface        *sourceSurface,*destSurface;
+                    VAConfigID           configID;
+                    VAContextID          contextID;
+                    bool                 passThrough;
+                    bool                 setupVaapi(void);
+                    bool                 cleanupVaapi(void);
+                    vaapiFilter          configuration;                    
+                    bool                 updateInfo(bool status);
+
+public:
+        
+                             vaapiVideoFilter(ADM_coreVideoFilter *previous,CONFcouple *conf);
+                             ~vaapiVideoFilter();
+
+        virtual const char   *getConfiguration(void);                 /// Return  current configuration as a human readable string
+        virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);           /// Return the next image
+        virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+		virtual void setCoupledConf(CONFcouple *couples);
+        virtual bool         configure(void) ;                        /// Start graphical user interface
+};
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   vaapiVideoFilter,   // Class
+                        1,0,0,              // Version
+                        ADM_UI_QT4+ADM_FEATURE_LIBVA,     // We need a display for VDPAU; so no cli...
+                        VF_TRANSFORM,            // Category
+                        "vaapiResize",            // internal name (must be uniq!)
+                        QT_TRANSLATE_NOOP("vaapiResize","vaapi: Resize"),            // Display name
+                        QT_TRANSLATE_NOOP("vaapiResize","vaapi: Resize image using vaapi.") // Description
+)
+       
+/**
+    \fn setupVaapi
+*/
+bool vaapiVideoFilter::setupVaapi(void)
+{
+    FilterInfo *prevInfo=previousFilter->getInfo();
+    FilterInfo *currentInfo=getInfo();
+
+    scaler=NULL;
+    info.width=configuration.targetWidth;
+    info.height=configuration.targetHeight;
+    
+    if(configuration.targetWidth==prevInfo->width && configuration.targetHeight==prevInfo->height && !configuration.mpeg2ToPC)
+    {
+        ADM_info("Passthrough\n");
+        return false;
+    }
+    
+    configID=admLibVA::createFilterConfig();
+    if(configID==VA_INVALID)
+    {
+        ADM_warning("Cannot create config\n");
+        return false;
+    }
+    
+    
+    
+    // Allocate source and target surface
+    sourceSurface=ADM_vaSurface::allocateWithSurface(prevInfo->width,prevInfo->height);
+    destSurface=ADM_vaSurface::allocateWithSurface(currentInfo->width,currentInfo->height);
+    if(!sourceSurface || !destSurface )
+    {
+        ADM_warning("Cannot allocate surface\n");
+        cleanupVaapi();
+        return false;
+    }
+    VASurfaceID surfaces[2]={sourceSurface->surface,destSurface->surface};
+    VAStatus status= vaCreateContext(admLibVA::getDisplay(),configID,
+                          configuration.targetWidth,configuration.targetHeight, VA_PROGRESSIVE,
+                          surfaces, 2,
+                          &contextID);
+    if(status!=VA_STATUS_SUCCESS)
+    {
+        ADM_warning("Cannot create context\n");
+        return false;
+    }
+    return true;    
+}
+/**
+    \fn cleanupVaapi
+*/
+bool vaapiVideoFilter::cleanupVaapi(void)
+{
+    if(sourceSurface)
+    {
+        delete sourceSurface;
+        sourceSurface=NULL;
+    }
+    if(destSurface)
+    {
+        delete destSurface;
+        destSurface=NULL;
+    }
+    if(configID!=VA_INVALID)
+    {
+        admLibVA::destroyFilterConfig(configID);
+        configID=VA_INVALID;
+    }
+    if(contextID!=VA_INVALID)
+    {
+        admLibVA::destroyFilterContext(contextID);
+        contextID=VA_INVALID;
+    }
+    
+    return true;
+}
+/**
+ * \fn updateInfo
+ * @param status
+ * @return 
+ */
+bool vaapiVideoFilter::updateInfo(bool status)
+{
+    passThrough=!status;
+    if(passThrough)
+    {
+        FilterInfo *prevInfo=previousFilter->getInfo();
+        info.width=prevInfo->width;
+        info.height=prevInfo->height;
+    }else
+    {
+        info.width=configuration.targetWidth;
+        info.height=configuration.targetHeight;
+    }
+    return true;
+}
+/**
+    \fn constructor
+*/
+vaapiVideoFilter::vaapiVideoFilter(ADM_coreVideoFilter *in, CONFcouple *setup)
+        : ADM_coreVideoFilterCached(5,in,setup)
+{
+    configID=VA_INVALID;
+    contextID=VA_INVALID;
+    sourceSurface=NULL;
+    destSurface=NULL;
+    if(!setup || !ADM_paramLoad(setup,vaapiFilter_param,&configuration))
+    {
+        // Default value
+        configuration.targetWidth=info.width;
+        configuration.targetHeight=info.height;
+        configuration.mpeg2ToPC=false;
+    }
+
+    myName="vaapi";
+    bool status=setupVaapi();
+    updateInfo(status);
+    
+}
+/**
+    \fn destructor
+*/
+vaapiVideoFilter::~vaapiVideoFilter()
+{
+        cleanupVaapi();
+}
+/**
+    \fn updateInfo
+*/
+bool vaapiVideoFilter::configure( void) 
+{
+     diaElemUInteger  tWidth(&(configuration.targetWidth),QT_TRANSLATE_NOOP("vaapiResize","Width :"),16,2048);
+     diaElemUInteger  tHeight(&(configuration.targetHeight),QT_TRANSLATE_NOOP("vaapiResize","Height :"),16,2048);
+     diaElemToggle    tMpeg2PC(&(configuration.mpeg2ToPC),   QT_TRANSLATE_NOOP("vaapiResize","mpeg->PC:"));
+     
+     diaElem *elems[]={&tWidth,&tHeight,&tMpeg2PC};
+     
+     if(diaFactoryRun(QT_TRANSLATE_NOOP("vaapiResize","vaapi"),sizeof(elems)/sizeof(diaElem *),elems))
+     {
+                ADM_info("New dimension : %d x %d\n",info.width,info.height);
+                cleanupVaapi();
+                bool status=setupVaapi();
+                updateInfo(status);
+                return true;
+     }
+     return false;
+}
+/**
+    \fn getCoupledConf
+    \brief Return our current configuration as couple name=value
+*/
+bool         vaapiVideoFilter::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, vaapiFilter_param,&configuration);
+}
+
+void vaapiVideoFilter::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, vaapiFilter_param, &configuration);
+}
+
+/**
+    \fn getConfiguration
+    \brief Return current setting as a string
+*/
+const char *vaapiVideoFilter::getConfiguration(void)
+{
+
+    static char conf[200];    
+    char conf2[80];
+    conf2[0]=0;
+    sprintf(conf,"vaapi:");
+    if(1) //configuration.resizeToggle)
+    {
+        sprintf(conf2,"%d x %d -> %d x %d, mpeg2PC %d",
+                        previousFilter->getInfo()->width, 
+                        previousFilter->getInfo()->height,
+                        configuration.targetWidth,configuration.targetHeight,(int)configuration.mpeg2ToPC);
+        strcat(conf,conf2);
+    }
+    conf[199]=0;
+    return conf;
+}
+/**
+    \fn getConfiguration
+    \brief Return current setting as a string
+*/
+bool vaapiVideoFilter::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+     bool r=false;
+     if(passThrough) 
+     {
+         ADM_info("VaapiFilter : passthrough\n");
+         return previousFilter->getNextFrame(fn,image);
+     }
+    // regular image, in fact we get the next image here    
+    ADMImage *next= vidCache->getImageAs(ADM_HW_LIBVA,nextFrame);
+    ADM_vaSurface *source=NULL;
+    if(!next)
+    {
+        ADM_warning("vaapiResize : cannot get image\n");
+        return false;
+    }
+    image->Pts=next->Pts;
+    if(next->refType==ADM_HW_LIBVA)
+    {
+          source=(ADM_vaSurface *)next->refDescriptor.refHwImage;
+          printf("image is already vaapi %d\n",(int)source->surface);
+    }else
+    {
+
+        printf("Uploading image to vaapi\n");
+        if(!admLibVA::admImageToSurface(next,sourceSurface))        
+        {
+            ADM_warning("Cannot upload to sourceSurface");
+            vidCache->unlockAll();
+            return false;
+        }
+        source=sourceSurface;
+    }    
+    
+    //-- Perform --
+    VAProcPipelineParameterBuffer params;
+    VABufferID paramId;
+    VAStatus status;
+
+    memset(&params,0,sizeof(params));
+    
+    params.surface=source->surface;
+    params.surface_region=NULL;
+    if(configuration.mpeg2ToPC)
+        params.surface_color_standard=VAProcColorStandardBT601 ; // FIXME
+    else
+        params.surface_color_standard=VAProcColorStandardBT709 ; // FIXME
+    params.output_region      =NULL;
+    params.output_background_color=0xff000000;
+    params.output_color_standard=VAProcColorStandardBT709; // FIXME
+            
+    params.pipeline_flags=0;
+    params.filter_flags=VA_FILTER_SCALING_HQ;
+    // Go
+#define CHECK(x) {status=x;if(status!=VA_STATUS_SUCCESS)    {ADM_warning( #x "Failed with error %d/%s\n",status,vaErrorStr(status));goto failed;}}
+#define CHECK2(x) {status=x;if(status!=VA_STATUS_SUCCESS)    {ADM_warning( #x "Failed with error %d/%s\n",status,vaErrorStr(status));goto failed2;}}
+    CHECK(vaBeginPicture(admLibVA::getDisplay(),  contextID, destSurface->surface));
+    CHECK(vaCreateBuffer(admLibVA::getDisplay(),  contextID,VAProcPipelineParameterBufferType,sizeof(params),1,&params,&paramId));
+    CHECK2(vaRenderPicture(admLibVA::getDisplay(),  contextID,&paramId, 1));
+    CHECK2(vaEndPicture(admLibVA::getDisplay(),  contextID));
+
+    vaDestroyBuffer(admLibVA::getDisplay(), paramId);
+ 
+    // Download result to regular ADMImage
+    r=destSurface->toAdmImage(image);
+    printf("Result is %d\n",r);
+failed2:    
+    vaDestroyBuffer(admLibVA::getDisplay(), paramId);
+failed:    
+    nextFrame++;
+    vidCache->unlockAll();
+    
+    return r;
+    
+}
+//****************
+// EOF

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/CMakeLists.txt Added

@@ -0,0 +1,25 @@
+INCLUDE(vf_plugin)
+ADD_CORE_INCLUDE(ADM_coreLibVA)
+
+FIND_PATH(VPP va/va_vpp.h PATHS /usr/include)
+IF(VPP)
+        MESSAGE(STATUS "Checking libva is recent enough..")
+        TRY_COMPILE(hasHeader
+		  ${CMAKE_BINARY_DIR}
+		  ${CMAKE_CURRENT_SOURCE_DIR}/testHeader.c 
+		  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${_include}" "-DLINK_LIBRARIES:STRING=va"
+		  COMPILE_DEFINITIONS ""
+		  OUTPUT_VARIABLE foo)
+
+        IF(hasHeader)
+                MESSAGE(STATUS "yes")
+                SET(ADM_vf_vaapiFilter_SRCS ADM_vidVaapiFilter.cpp )
+                ADD_VIDEO_FILTER(ADM_vf_vaapiFilter ${ADM_vf_vaapiFilter_SRCS})
+                TARGET_LINK_LIBRARIES( ADM_vf_vaapiFilter ADM_coreLibVA6 ) 
+                TARGET_LINK_LIBRARIES( ADM_vf_vaapiFilter va)
+                INIT_VIDEO_FILTER(ADM_vf_vaapiFilter)
+                INSTALL_VIDEO_FILTER(ADM_vf_vaapiFilter)
+        ELSE(hasHeader)
+                MESSAGE(STATUS "no ")
+        ENDIF(hasHeader)
+ENDIF(VPP)

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/testHeader.c Added

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.conf Added

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.h Added

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_desc.cpp Added

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_json.cpp Added

avidemux_2.6.15.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp -> avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp Changed

@@ -2,7 +2,7 @@
                     \file     shaderLoader
                     \brief    Rotate picture
 
-   
+
                     copyright            : (C) 2011 by mean
 
  ***************************************************************************/
@@ -76,11 +76,11 @@
         _parentQGL->makeCurrent();
         fboY->bind();
         ready=true;
-       
+
         printf("Compiling shader \n");
         glProgramY = new QGLShaderProgram(_context);
         ADM_assert(glProgramY);
-        
+
         // Load the file info memory
         int sourceSize=-1;
         if(ADM_fileExist(params.shaderFile.c_str()))
@@ -98,7 +98,7 @@
         }
         if(ready)
         {
-            uint8_t *buffer=(uint8_t *)alloca(sourceSize+1);
+            uint8_t *buffer=(uint8_t *)admAlloca(sourceSize+1);
             FILE *f=fopen(params.shaderFile.c_str(),"rt");
             if(f)
             {
@@ -173,12 +173,12 @@
     // size is the last one...
     fboY->bind();
 
-    glProgramY->setUniformValue("myTextureU", 1); 
-    glProgramY->setUniformValue("myTextureV", 2); 
-    glProgramY->setUniformValue("myTextureY", 0); 
-    glProgramY->setUniformValue("myResolution", (GLfloat)info.width,(GLfloat)info.height); 
-    
-    glProgramY->setUniformValue("pts", (GLfloat)original->Pts); 
+    glProgramY->setUniformValue("myTextureU", 1);
+    glProgramY->setUniformValue("myTextureV", 2);
+    glProgramY->setUniformValue("myTextureY", 0);
+    glProgramY->setUniformValue("myResolution", (GLfloat)info.width,(GLfloat)info.height);
+
+    glProgramY->setUniformValue("pts", (GLfloat)original->Pts);
 
     uploadAllPlanes(original);
 
@@ -220,11 +220,11 @@
 /**
     \fn configure
 */
-bool shaderLoader::configure( void) 
+bool shaderLoader::configure( void)
 {
     diaElemFile shader(0,params.shaderFile,QT_TRANSLATE_NOOP("glShader","ShaderFile to load"));
     diaElem *elems[]={&shader};
-     
+
      if(diaFactoryRun(QT_TRANSLATE_NOOP("glShader","ShaderLoader"),sizeof(elems)/sizeof(diaElem *),elems))
      {
                 return true;
@@ -232,16 +232,16 @@
      return false;
 }
 /**
- * 
- * @return 
+ *
+ * @return
  */
 bool shaderLoader::genQuad(void)
 {
   int width=info.width;
   int height=info.height;
 
-#define POINT(a,b)  glTexCoord2i(a, b);glVertex2i(a, b);  
-  
+#define POINT(a,b)  glTexCoord2i(a, b);glVertex2i(a, b);
+
   glDeleteLists(glList,1);
   glNewList(glList,GL_COMPILE);
   glBegin(GL_QUADS);

avidemux_2.6.15.tar.gz/avidemux_plugins/CMakeLists.txt -> avidemux_2.6.16.tar.gz/avidemux_plugins/CMakeLists.txt Changed

@@ -16,7 +16,7 @@
 IF(NOT FAKEROOT)
 	SET(AVIDEMUX_FAKEROOT "")
 else(NOT FAKEROOT)
-	SET(AVIDEMUX_FAKEROOT "${FAKEROOT}/")
+	SET(AVIDEMUX_FAKEROOT "${FAKEROOT}")
 endif(NOT FAKEROOT)
 
 
@@ -64,6 +64,34 @@
 LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
 INCLUDE_DIRECTORIES("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6")
 
+#########################################
+# Unbundle some libraries here
+#########################################
+OPTION(USE_EXTERNAL_LIBASS "Use system installed libass library." OFF)
+OPTION(USE_EXTERNAL_LIBMAD "Use system installed libmad library." OFF)
+OPTION(USE_EXTERNAL_LIBA52 "Use system installed liba52 library." OFF)
+
+INCLUDE(FindPkgConfig)
+
+# libass
+IF(USE_EXTERNAL_LIBASS)
+        PKG_CHECK_MODULES(LIBASS REQUIRED libass)
+        INCLUDE_DIRECTORIES(SYSTEM ${LIBASS_INCLUDE_DIRS})
+ENDIF()
+
+# libmad
+IF(USE_EXTERNAL_LIBMAD)
+        FIND_PATH(LIBMAD_INCLUDE_DIR mad.h)
+        FIND_LIBRARY(LIBMAD_LIBRARIES mad)
+        INCLUDE_DIRECTORIES(SYSTEM ${LIBMAD_INCLUDE_DIRS})
+ENDIF()
+
+# liba52
+IF(USE_EXTERNAL_LIBA52)
+        FIND_PATH(LIBA52_INCLUDE_DIR a52dec/a52.h)
+        FIND_LIBRARY(LIBA52_LIBRARIES a52)
+        INCLUDE_DIRECTORIES(SYSTEM ${LIBA52_INCLUDE_DIR})
+ENDIF()
 
 IF (FRESH_BUILD)
 	MESSAGE("")
@@ -71,7 +99,7 @@
 ########################################
 # retrieve core config, needed to get USE_VDPAU and friends
 ########################################
-include(${ADM_HEADER_DIR}/ADM_coreConfig.cmake)
+include(ADM_coreConfig)
 
 ########################################
 # Global options

avidemux_2.6.15.tar.gz/bootStrap.bash -> avidemux_2.6.16.tar.gz/bootStrap.bash Changed

@@ -8,7 +8,6 @@
 rebuild=0
 do_core=1
 do_cli=1
-do_gtk=0  # Gtk is obsolete!
 do_qt4=1
 do_plugins=1
 do_asan=0
@@ -20,6 +19,14 @@
 export QT_SELECT=5 # default for ubuntu, harmless for others
 export O_PARAL="-j $(nproc)"
 install_prefix="$default_install_prefix"
+# -lc is required to build libADM_ae_lav* audio encoder plugins on 32 bit ubuntu
+if [[ $(uname -m) = i?86 ]] ; then
+        export need_ae_lav_build_quirk=1
+fi
+external_libass=0
+external_liba52=0
+external_libmad=0
+
 fail()
 {
         echo "** Failed at $1**"
@@ -34,6 +41,7 @@
         export EXTRA=$3
         export DEBUG=""
         export ASAN=""
+        export BUILD_QUIRKS=""
         BUILDER="Unix Makefiles"
         if [ "x$debug" = "x1" ] ; then 
                 DEBUG="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug  "
@@ -49,11 +57,14 @@
         if [ "x$rebuild" != "x1" ] ; then
                 rm -Rf ./$BUILDDIR
         fi
+        if [ "x$need_ae_lav_build_quirk" = "x1" ] ; then
+                BUILD_QUIRKS="-DAE_LAVCODEC_BUILD_QUIRK=true"
+        fi
         if [ ! -e "$BUILDDIR" ] ; then
                 mkdir $BUILDDIR || fail mkdir
         fi
         cd $BUILDDIR 
-        cmake $COMPILER $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim $INSTALL_PREFIX $EXTRA $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
+        cmake $COMPILER $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim $INSTALL_PREFIX $EXTRA $BUILD_QUIRKS $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
         make  $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR"
 	if  [ "x$PKG" != "x" ] ; then
           $FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package
@@ -80,7 +91,6 @@
         else echo   "Release build"
         fi
         printModule $do_core Core
-        printModule $do_gtk Gtk
         printModule $do_qt4 ${qt_ext}
         printModule $do_cli Cli
         printModule $do_plugins Plugins
@@ -89,26 +99,27 @@
 {
         echo "Bootstrap avidemux 2.6:"
         echo "***********************"
-        echo "  --help            : Print usage"
-        echo "  --prefix=DIR      : Install to directory DIR (default: $default_install_prefix)"
-        echo "  --rpm             : Build rpm packages"
-        echo "  --deb             : Build deb packages"
-        echo "  --tgz             : Build tgz packages"
-        echo "  --debug           : Switch debugging on"
-        echo "  --rebuild         : Preserve existing build directories"
-        echo "  --with-core       : Build core"
-        echo "  --without-core    : Dont build core"
-        echo "  --with-cli        : Build cli"
-        echo "  --without-cli     : Dont build cli"
-        echo "  --with-gtk        : Build gtk"
-        echo "  --without-gtk     : Dont build gtk"
-        echo "  --with-core       : Build core"
-        echo "  --without-qt4     : Dont build qt4"
-        echo "  --with-plugins    : Build plugins"
-        echo "  --without-plugins : Dont build plugins"
-        echo "  --enable-qt4      : Try to use qt4 instead of qt5"
-        echo "  --enable-asan     : Enable Clang/llvm address sanitizer"
-        echo "  --with-clang      : Use clang/clang++ as compiler"
+        echo "  --help                : Print usage"
+        echo "  --prefix=DIR          : Install to directory DIR (default: $default_install_prefix)"
+        echo "  --rpm                 : Create rpm packages"
+        echo "  --deb                 : Create deb packages"
+        echo "  --tgz                 : Create tgz packages"
+        echo "  --debug               : Switch debugging on"
+        echo "  --rebuild             : Preserve existing build directories"
+        echo "  --with-core           : Build core"
+        echo "  --without-core        : Don't build core"
+        echo "  --with-cli            : Build cli"
+        echo "  --without-cli         : Don't build cli"
+        echo "  --with-core           : Build core"
+        echo "  --without-qt4         : Don't build qt4"
+        echo "  --with-plugins        : Build plugins"
+        echo "  --without-plugins     : Don't build plugins"
+        echo "  --enable-qt4          : Try to use qt4 instead of qt5"
+        echo "  --enable-asan         : Enable Clang/llvm address sanitizer"
+        echo "  --with-clang          : Use clang/clang++ as compiler"
+        echo "  --with-system-libass  : Use system libass instead of the bundled one"
+        echo "  --with-system-liba52  : Use system liba52 (a52dec) instead of the bundled one"
+        echo "  --with-system-libmad  : Use system libmad instead of the bundled one"
 	echo "The end result will be in the install folder. You can then copy it to / or whatever"
         config 
 
@@ -193,9 +204,6 @@
          --without-cli)
                 do_cli=0
              ;;
-         --without-gtk)
-                do_gtk=0
-             ;;
          --without-plugins)
                 do_plugins=0
              ;;
@@ -216,15 +224,21 @@
          --with-cli)
                 do_cli=1
              ;;
-         --with-gtk)
-                do_gtk=1
-             ;;
          --with-plugins)
                 do_plugins=1
              ;;
          --with-core)
                 do_core=1
              ;;
+         --with-system-libass)
+                external_libass=1
+             ;;
+         --with-system-liba52)
+                external_liba52=1
+             ;;
+         --with-system-libmad)
+                external_libmad=1
+             ;;
         *)
                 echo "unknown parameter $config_option"
                 usage
@@ -240,6 +254,15 @@
 export POSTFIX=""
 export FAKEROOT_DIR=$PWD/install
 export PARAL="$O_PARAL"
+if [ "x$external_libass" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBASS=true $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$external_liba52" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBA52=true $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$external_libmad" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBMAD=true $EXTRA_CMAKE_DEFS"
+fi
 echo "Top dir : $TOP"
 echo "Fake installation directory=$FAKEROOT_DIR"
 if [ "x$debug" = "x1" ] ; then echo   
@@ -275,37 +298,25 @@
         echo " Installing cli"
         cd $TOP/buildCli${POSTFIX}  
 fi
-if [ "x$do_gtk" = "x1" ] ; then 
-        echo "** GTK **"
-        cd $TOP
-        Process buildGtk ../avidemux/gtk 
-        echo " Installing Gtk"
-        cd $TOP/buildGtk${POSTFIX} 
-fi
 if [ "x$do_plugins" = "x1" ] ; then 
         echo "** Plugins **"
         cd $TOP
-        Process buildPluginsCommon ../avidemux_plugins -DPLUGIN_UI=COMMON
+        Process buildPluginsCommon ../avidemux_plugins "-DPLUGIN_UI=COMMON $EXTRA_CMAKE_DEFS"
 fi
 if [ "x$do_plugins" = "x1" -a "x$do_qt4" = "x1" ] ; then 
         echo "** Plugins ${qt_ext} **"
         cd $TOP
-        Process buildPlugins${qt_ext} ../avidemux_plugins -DPLUGIN_UI=QT4
-fi
-if [ "x$do_plugins" = "x1" -a "x$do_gtk" = "x1" ] ; then 
-        echo "** Plugins Gtk **"
-        cd $TOP
-        Process buildPluginsGtk ../avidemux_plugins -DPLUGIN_UI=GTK
+        Process buildPlugins${qt_ext} ../avidemux_plugins "-DPLUGIN_UI=QT4 $EXTRA_CMAKE_DEFS"
 fi
 if [ "x$do_plugins" = "x1" -a "x$do_cli" = "x1" ] ; then 
         echo "** Plugins CLI **"
         cd $TOP
-        Process buildPluginsCLI ../avidemux_plugins -DPLUGIN_UI=CLI
+        Process buildPluginsCLI ../avidemux_plugins "-DPLUGIN_UI=CLI $EXTRA_CMAKE_DEFS"
 fi
 if [ "x$do_plugins" = "x1"  ] ; then 
         echo "** Plugins Settings **"
         cd $TOP
-        Process buildPluginsSettings ../avidemux_plugins -DPLUGIN_UI=SETTINGS
+        Process buildPluginsSettings ../avidemux_plugins "-DPLUGIN_UI=SETTINGS $EXTRA_CMAKE_DEFS"
 fi

avidemux_2.6.16.tar.gz/bootStrapCrossMingwQt5_mxe.sh Added

@@ -0,0 +1,372 @@
+#!/bin/bash
+
+# Default config
+
+bits=32
+default_mxerootdir="/opt/mxe"
+mxerootdir="$default_mxerootdir"
+rebuild=0
+do_core=1
+do_qt=1
+do_cli=1
+do_plugins=1
+external_libass=0
+external_liba52=0
+external_libmad=0
+do_release_pkg=1
+
+# Functions
+
+setupEnv()
+{
+    export BUILDDATE=$(date +%y%m%d-%H%M%S)
+    if [ "x$external_libass" = "x1" ]; then
+        export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBASS=true $EXTRA_CMAKE_DEFS"
+    fi
+    if [ "x$external_liba52" = "x1" ]; then
+        export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBA52=true $EXTRA_CMAKE_DEFS"
+    fi
+    if [ "x$external_libmad" = "x1" ]; then
+        export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBMAD=true $EXTRA_CMAKE_DEFS"
+    fi
+    export TOP=$PWD
+    export BITS=$bits
+    if [ "x$BITS" = "x64" ]; then
+        export ARCH="x86_64"
+    else
+        export ARCH="i686"
+    fi
+    export MXE_ROOT=$mxerootdir
+    export MXE_TARGET=${ARCH}-w64-mingw32.shared
+    export QT_SELECT=5
+    export QT_HOME=${MXE_ROOT}/usr/${MXE_TARGET}/qt5
+    export MINGW=${MXE_ROOT}/usr/${MXE_TARGET}
+    export PATH=$PATH:${MXE_ROOT}/usr/bin:${QT_HOME}/bin
+    export PKG_CONFIG_PATH=$MINGW/lib/pkgconfig
+    export PKG_CONFIG_LIBDIR=$MINGW/lib/pkgconfig
+    export CROSS_PREFIX=$MXE_TARGET
+    export SDL2DIR=${MXE_ROOT}/usr/${MXE_TARGET}
+    export INSTALL_DIR=${MINGW}/out/avidemux
+    #export INSTALL_DEV=${INSTALL_DIR}-dev
+    export CXXFLAGS="-std=c++11"
+    export PARAL="-j $(nproc)"
+    export TOOLCHAIN_LOCATION=${MXE_ROOT}/usr
+    export CROSS_C_COMPILER=gcc
+    export CROSS_CXX_COMPILER=g++
+}
+
+fail()
+{
+    echo "** Failed at $1 **"
+    exit 1
+}
+
+Process()
+{
+    cd $TOP
+    export BUILDDIR=$1
+    export SOURCEDIR=$2
+    export EXTRA=$3
+    echo "Building $BUILDDIR from $SOURCEDIR (Extra=$EXTRA)"
+    if [ "x$rebuild" != "x1" ]; then
+        rm -Rf ./"$BUILDDIR"
+    fi
+    if [ ! -e "$BUILDDIR" ]; then
+        mkdir "$BUILDDIR" || fail mkdir
+    fi
+    cd $BUILDDIR
+    cmake -DCROSS=$MINGW \
+    -DCMAKE_SYSTEM_NAME:STRING=Windows \
+    -DCMAKE_FIND_ROOT_PATH=$MINGW \
+    -DTOOLCHAIN_LOCATION=$TOOLCHAIN_LOCATION \
+    -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
+    -DCMAKE_CROSS_PREFIX=$CROSS_PREFIX \
+    -DCMAKE_C_COMPILER:STRING=${CROSS_PREFIX}-${CROSS_C_COMPILER} \
+    -DCMAKE_CXX_COMPILER:STRING=${CROSS_PREFIX}-${CROSS_CXX_COMPILER} \
+    -DCMAKE_LINKER:STRING=${CROSS_PREFIX}-ld \
+    -DCMAKE_AR:STRING=${CROSS_PREFIX}-ar \
+    -DCMAKE_RC_COMPILER:STRING=${CROSS_PREFIX}-windres \
+    -DAVIDEMUX_TOP_SOURCE_DIR="$TOP" \
+    -DTYPE2_CROSS_SETUP=true \
+    -G "Unix Makefiles" \
+    $EXTRA \
+    $SOURCEDIR || fail cmake
+    make $PARAL VERBOSE=1 >& /tmp/log$BUILDDIR || fail make
+    make install || fail make_install
+    # Only install  component=dev for dev package
+    # DESTDIR=${MINGWDEV} cmake -DCOMPONENT=dev -P cmake_install.cmake || fail make_install_dev
+}
+
+usage()
+{
+    echo "Usage: bash $0 [OPTION]"
+    echo "  --help                : Print usage"
+    echo "  --32                  : Build a 32 bit application (default)"
+    echo "  --64                  : Build a 64 bit application"
+    echo "  --mxe-root=DIR        : Use MXE installed in DIR (default: ${default_mxerootdir})"
+    echo "  --rebuild             : Preserve existing build directories"
+    echo "  --with-core           : Build core"
+    echo "  --without-core        : Don't build core"
+    echo "  --with-cli            : Build cli"
+    echo "  --without-cli         : Don't build cli"
+    echo "  --with-core           : Build core"
+    echo "  --without-qt          : Don't build qt5"
+    echo "  --with-plugins        : Build plugins"
+    echo "  --without-plugins     : Don't build plugins"
+    echo "  --with-system-libass  : Use the system libass instead of the bundled one"
+    echo "  --with-system-liba52  : Use the system liba52 (a52dec) instead of the bundled one"
+    echo "  --with-system-libmad  : Use the system libmad instead of the bundled one"
+    echo "  --nopkg               : Don't create a ZIP archive with all required libraries"
+}
+
+option_value()
+{
+    echo $(echo $* | cut -d '=' -f 2-)
+}
+
+option_name()
+{
+    echo $(echo $* | cut -d '=' -f 1 | cut -b 3-)
+}
+
+dir_check()
+{
+    op_name="$1"
+    dir_path="$2"
+    if [ "x$dir_path" != "x" ] ; then
+        if [[ "$dir_path" != /* ]] ; then
+            >&2 echo "Expected an absolute path for --$op_name=$dir_path, aborting."
+            exit 1
+        fi
+    else
+        >&2 echo "Empty path provided for --$op_name, aborting."
+        exit 1
+    fi
+    case "$dir_path" in
+      */)
+          echo $(expr "x$dir_path" : 'x$.*[^/]$') # strip trailing slashes
+          ;;
+      *)
+          echo "$dir_path"
+          ;;
+    esac
+}
+
+create_release_package()
+{
+    if [ ! -e ${INSTALL_DIR}/avidemux.exe ]; then
+        echo "No avidemux.exe (${BITS} bit) found in ${INSTALL_DIR}, aborting"
+        exit 1
+    fi
+    echo "Preparing release package..."
+    cd $TOP
+    PACKAGE_DIR="packaged_mingw_build_${BUILDDATE}"
+    if [ ! -e $PACKAGE_DIR ]; then
+        mkdir $PACKAGE_DIR
+    fi
+    cp -a $INSTALL_DIR $PACKAGE_DIR
+    cd $PACKAGE_DIR
+    mv -v avidemux avidemux_$BITS
+    TARGETDIR=${TOP}/${PACKAGE_DIR}/avidemux_${BITS}
+    if [ ! -e ${TARGETDIR}/platforms ]; then
+        mkdir ${TARGETDIR}/platforms;
+    fi
+    cd ${MINGW}/bin
+    if [ "x${external_liba52}" = "x1" ]; then
+        cp -v liba52-*.dll $TARGETDIR
+    fi    
+    if [ "x${external_libass}" = "x1" ]; then
+        cp -v libass-*.dll $TARGETDIR
+    fi
+    if [ "x${external_libmad}" = "x1" ]; then
+        cp -v libmad-*.dll $TARGETDIR
+    fi
+    cp -v \
+    libbz2.dll \
+    libeay32.dll \
+    libexpat-*.dll \
+    libfaad-*.dll \
+    libfdk-aac-*.dll \
+    libffi-*.dll \
+    libfontconfig-*.dll \
+    libfreetype-*.dll \
+    libfribidi-*.dll \
+    libgcc_*.dll \
+    libglib-*.dll \
+    libgobject-*.dll \
+    libharfbuzz-*.dll \
+    libiconv-*.dll \
+    libintl-*.dll \
+    libmp3lame-*.dll \
+    libogg-*.dll \
+    libopus-*.dll \
+    libpcre16-*.dll \
+    libpcre-*.dll \
+    libpng16-*.dll \
+    libsqlite3-*.dll \
+    libstdc++-*.dll \
+    libvorbis-*.dll \
+    libvorbisenc-*.dll \
+    libvorbisfile-*.dll \
+    libwinpthread-*.dll \
+    libx264-*.dll \
+    libx265.dll \
+    SDL2.dll \
+    ssleay32.dll \
+    xvidcore.dll \
+    zlib1.dll \
+    $TARGETDIR;
+    cd $QT_HOME
+    cp -v \
+    bin/Qt5Core.dll \
+    bin/Qt5Gui.dll \
+    bin/Qt5Network.dll \
+    bin/Qt5OpenGL.dll \
+    bin/Qt5Widgets.dll \
+    bin/Qt5WinExtras.dll \
+    $TARGETDIR;
+    cp -v \
+    plugins/platforms/qminimal.dll \
+    plugins/platforms/qwindows.dll \
+    ${TARGETDIR}/platforms/;
+    mkdir ${TARGETDIR}/etc
+    cp -rvL ${MINGW}/etc/fonts ${TARGETDIR}/etc
+    cd $TARGETDIR
+    find . -name "*.dll.a" -exec rm -v '{}' \;
+    rm -Rf include
+    cd ../
+    zip -r avidemux_r${BUILDDATE}_win${BITS}Qt5.zip avidemux_$BITS
+    rm -Rf avidemux_$BITS
+    cd $TOP
+    echo "Avidemux Windows package generated as ${TOP}/${PACKAGE_DIR}/avidemux_r${BUILDDATE}_win${BITS}Qt5.zip"
+}
+
+# Options handling
+
+while [ $# != 0 ]; do
+    config_option="$1"
+    case "$config_option" in
+        -h|--help)
+            usage
+            exit 1
+            ;;
+        --32)
+            bits=32
+            ;;
+        --64)
+            bits=64
+            ;;
+        --mxe-root=*)
+            mxerootdir=$(dir_check $(option_name "$config_option") $(option_value "$config_option")) || exit 1
+            ;;
+        --debug)
+            debug=1
+            ;;
+        --rebuild)
+            rebuild=1
+            ;;
+        --without-qt)
+            do_qt=0
+            ;;
+        --without-cli)
+            do_cli=0
+            ;;
+        --without-plugins)
+            do_plugins=0
+            ;;
+        --without-core)
+            do_core=0
+            ;;
+        --with-qt)
+            do_qt=1
+            ;;
+        --with-cli)
+            do_cli=1
+            ;;
+        --with-plugins)
+            do_plugins=1
+            ;;
+        --with-core)
+            do_core=1
+            ;;
+        --with-system-libass)
+            export external_libass=1
+            ;;
+        --with-system-liba52)
+            export external_liba52=1
+            ;;
+        --with-system-libmad)
+            export external_libmad=1
+            ;;
+        --nopkg)
+            do_release_pkg=0
+            ;;
+        *)
+            echo "unknown parameter $config_option"
+            usage
+            exit 1
+            ;;
+        esac
+    shift
+done
+
+
+# Set all the required paths and env variables
+
+setupEnv
+
+# Create destination directory
+
+echo "** Bootstrapping Avidemux **"
+if [ -e "$INSTALL_DIR" -a "x$do_core" = "x1" -a "x$do_qt" = "x1" ]; then
+    rm -Rf "$INSTALL_DIR";
+fi
+mkdir -p $INSTALL_DIR
+echo "Top dir : $TOP"
+
+# Build and install Avidemux components to the destination dir
+
+if [ "x$do_core" = "x1" ]; then 
+    echo "** CORE **"
+    Process buildMingwCore-${ARCH} ../avidemux_core
+fi
+
+if [ "x$do_qt" = "x1" ]; then
+    echo "** QT **"
+    Process buildMingwQt5-${ARCH} ../avidemux/qt4 "-DQT_HOME:STRING=$QT_HOME -DENABLE_QT5=true"
+fi
+
+if [ "x$do_cli" = "x1" ]; then
+    echo "** CLI **"
+    Process buildMingwCli-${ARCH} ../avidemux/cli
+fi
+
+if [ "x$do_plugins" = "x1" ]; then
+    echo "** Plugins **"
+    Process buildMingwPluginsCommon-${ARCH} ../avidemux_plugins "-DPLUGIN_UI=COMMON $EXTRA_CMAKE_DEFS"
+fi
+
+if [ "x$do_plugins" = "x1" -a "x$do_qt" = "x1" ]; then
+    echo "** Plugins Qt **"
+    Process buildMingwPluginsQt5-${ARCH} ../avidemux_plugins "-DPLUGIN_UI=QT4 -DQT_HOME:STRING=$QT_HOME -DENABLE_QT5=true $EXTRA_CMAKE_DEFS"
+fi
+
+if [ "x$do_plugins" = "x1" -a "x$do_cli" = "x1" ]; then
+    echo "** Plugins CLI **"
+    Process buildMingwPluginsCli-${ARCH} ../avidemux_plugins "-DPLUGIN_UI=CLI $EXTRA_CMAKE_DEFS"
+fi
+
+if [ "x$do_plugins" = "x1" ]; then
+    echo "** Plugins Settings **"
+    Process buildMingwPluginsSettings-${ARCH} ../avidemux_plugins "-DPLUGIN_UI=SETTINGS $EXTRA_CMAKE_DEFS"
+fi
+
+# Create a ZIP archive with avidemux and all the required libs
+
+if [ "x$do_release_pkg" = "x1" ]; then
+    create_release_package
+fi
+
+echo "** All done **"
+cd $TOP
+echo "** ALL DONE **"

avidemux_2.6.15.tar.gz/bootStrapOsx_Sierra.bash -> avidemux_2.6.16.tar.gz/bootStrapOsx_Sierra.bash Changed

avidemux_2.6.15.tar.gz/cmake/ADM_coreConfig.h.cmake -> avidemux_2.6.16.tar.gz/cmake/ADM_coreConfig.h.cmake Changed

avidemux_2.6.15.tar.gz/cmake/ad_plugin.cmake -> avidemux_2.6.16.tar.gz/cmake/ad_plugin.cmake Changed

avidemux_2.6.15.tar.gz/cmake/admCheckNvEnc.cmake -> avidemux_2.6.16.tar.gz/cmake/admCheckNvEnc.cmake Changed

avidemux_2.6.15.tar.gz/cmake/admCheckQt5.cmake -> avidemux_2.6.16.tar.gz/cmake/admCheckQt5.cmake Changed

@@ -8,7 +8,11 @@
         MESSAGE(STATUS "******************")
         IF(CROSS)
                 MESSAGE(STATUS "Cross compiling override for QT5")
-                SET(CROSS5 /usr/lib/x86_64-linux-gnu/cmake/)
+                IF(TYPE2_CROSS_SETUP)
+                        SET(CROSS5 ${CROSS}/qt5/lib/cmake)
+                ELSE(TYPE2_CROSS_SETUP)
+                        SET(CROSS5 /usr/lib/x86_64-linux-gnu/cmake/)
+                ENDIF(TYPE2_CROSS_SETUP)
                 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets)
                 SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets)
                 MESSAGE(STATUS "Search path ${CMAKE_MODULE_PATH}")
@@ -20,8 +24,13 @@
                 SET(QT_QTOPENGL_LIBRARIES Qt5OpenGL)
                 SET(QT_QTOPENGL_INCLUDE_DIR ${QT_HOME}/include/QtOpenGL)
 
-                SET(QT_HEADERS_DIR   ${QT_HOME}/include/qt5  ${QT_HOME}/include/qt5/QtGui ${QT_HOME}/include/qt5/QtCore ${QT_HOME}/include/qt5/QtWidgets ${QT_HOME}/include/qt5/QtNetwork)
-                SET(QT_INCLUDES    -I${QT_HOME}/include/qt5 -I${QT_HOME}/include/qt5/QtGui -I${QT_HOME}/include/qt5/QtCore -I${QT_HOME}/include/qt5/QtWidgets -I${QT_HOME}/include/qt5/QtNetwork)
+                IF(TYPE2_CROSS_SETUP)
+                        SET(QT_HEADERS_DIR   ${QT_HOME}/include  ${QT_HOME}/include/QtGui ${QT_HOME}/include/QtCore ${QT_HOME}/include/QtWidgets ${QT_HOME}/include/QtNetwork)
+                        SET(QT_INCLUDES    -I${QT_HOME}/include -I${QT_HOME}/include/QtGui -I${QT_HOME}/include/QtCore -I${QT_HOME}/include/QtWidgets -I${QT_HOME}/include/QtNetwork)
+                ELSE(TYPE2_CROSS_SETUP)
+                        SET(QT_HEADERS_DIR   ${QT_HOME}/include/qt5  ${QT_HOME}/include/qt5/QtGui ${QT_HOME}/include/qt5/QtCore ${QT_HOME}/include/qt5/QtWidgets ${QT_HOME}/include/qt5/QtNetwork)
+                        SET(QT_INCLUDES    -I${QT_HOME}/include/qt5 -I${QT_HOME}/include/qt5/QtGui -I${QT_HOME}/include/qt5/QtCore -I${QT_HOME}/include/qt5/QtWidgets -I${QT_HOME}/include/qt5/QtNetwork)
+                ENDIF(TYPE2_CROSS_SETUP)
                 SET(QT_INCLUDE_DIR   ${QT_HEADERS_DIR})
                 SET(QT_BINARY_DIR    ${QT_HOME}/bin)
                 SET(QT_LIBRARY_DIR   ${QT_HOME}/lib ${QT_HOME}/bin)
@@ -34,7 +43,11 @@
                 SET(QT_LIBRARY_EXTENSION QT5)
                 SET(QT5_FOUND True)
                 SET(ADM_QT_VERSION 5)
-                SET(QT5_ROOT_DIR /usr/lib/x86_64-linux-gnu/qt5/bin)
+                IF(TYPE2_CROSS_SETUP)
+                        SET(QT5_ROOT_DIR ${QT_HOME}/bin)
+                ELSE(TYPE2_CROSS_SETUP)
+                        SET(QT5_ROOT_DIR /usr/lib/x86_64-linux-gnu/qt5/bin)
+                ENDIF(TYPE2_CROSS_SETUP)
                 SET(QT_RCC_EXECUTABLE ${QT5_ROOT_DIR}/rcc)
                 SET(QT_MOC_EXECUTABLE ${QT5_ROOT_DIR}/moc)
                 SET(QT_UIC_EXECUTABLE ${QT5_ROOT_DIR}/uic)
@@ -58,7 +71,9 @@
                     FIND_PACKAGE(Qt5Widgets)    
                     MESSAGE(STATUS "  Checking for Qt5Network")
                     FIND_PACKAGE(Qt5Network)    
-
+                    IF(WIN32)
+                        FIND_PACKAGE(Qt5WinExtras)    
+                    ENDIF(WIN32)
                     IF(Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Network_FOUND)
                         MESSAGE(STATUS "  Qt5 found ")
                         SET(QT5_FOUND 1)
@@ -66,7 +81,7 @@
                         SET(QT_INCLUDE_DIR   ${QT_INCLUDES})
                         SET(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES})
                         SET(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES})
-                        SET(QT_QTGUI_LIBRARY  ${Qt5Widgets_LIBRARIES})
+                        SET(QT_QTGUI_LIBRARY  ${Qt5Widgets_LIBRARIES} ${Qt5WinExtras_LIBRARIES})
                         SET(QT_DEFINITIONS    ${Qt5Core_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS})
                         STRING(REGEX REPLACE "[\\]" "/" QT_INCLUDES "${QT_INCLUDES}")    # backslashes aren't taken care of properly on Windows
                         MESSAGE(STATUS "QT5_INCLUDES     : ${QT_INCLUDES}")

avidemux_2.6.15.tar.gz/cmake/admCheckRequiredLibs.cmake -> avidemux_2.6.16.tar.gz/cmake/admCheckRequiredLibs.cmake Changed

avidemux_2.6.15.tar.gz/cmake/admDetermineSystem.cmake -> avidemux_2.6.16.tar.gz/cmake/admDetermineSystem.cmake Changed

@@ -50,38 +50,44 @@
 ########################################
 # Check CPU support
 ########################################
-PERFORM_SYSTEM_TEST(cpu_x86-64_check.cpp "x86 64-bit" X86_64_SUPPORTED)
-
-IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
-	SET(ADM_CPU_64BIT 1)
-ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 8)
-
-IF (X86_64_SUPPORTED)
-	SET(ADM_CPU_X86 1)
-	SET(ADM_CPU_X86_64 1)
-ELSE (X86_64_SUPPORTED)
-	PERFORM_SYSTEM_TEST(cpu_x86_check.cpp "x86 32-bit" X86_32_SUPPORTED)
-
-	IF (X86_32_SUPPORTED)
-		SET(ADM_CPU_X86 1)
-		SET(ADM_CPU_X86_32 1)
-	ELSE (X86_32_SUPPORTED)
-		PERFORM_SYSTEM_TEST(cpu_armel_check.cpp "ARM EL" ARMEL_SUPPORTED)
-
-        IF(ARMEL_SUPPORTED)
-			SET(ADM_CPU_ARMEL 1)
-        ENDIF(ARMEL_SUPPORTED)
-	ENDIF (X86_32_SUPPORTED)
-ENDIF (X86_64_SUPPORTED)
-
-IF (NOT MSVC AND NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_ARMEL)
-	MESSAGE(FATAL_ERROR "CPU not supported")
-ENDIF (NOT MSVC AND NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_ARMEL)
-
-TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN)
-
-IF (CMAKE_WORDS_BIGENDIAN)
-	SET(ADM_BIG_ENDIAN 1)
-ENDIF (CMAKE_WORDS_BIGENDIAN)
+IF(NOT MSVC)
+        PERFORM_SYSTEM_TEST(cpu_x86-64_check.cpp "x86 64-bit" X86_64_SUPPORTED)
+
+        IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
+	        SET(ADM_CPU_64BIT 1)
+        ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 8)
+
+        IF (X86_64_SUPPORTED)
+	        SET(ADM_CPU_X86 1)
+	        SET(ADM_CPU_X86_64 1)
+        ELSE (X86_64_SUPPORTED)
+	        PERFORM_SYSTEM_TEST(cpu_x86_check.cpp "x86 32-bit" X86_32_SUPPORTED)
+        
+	        IF (X86_32_SUPPORTED)
+		        SET(ADM_CPU_X86 1)
+		        SET(ADM_CPU_X86_32 1)
+	        ELSE (X86_32_SUPPORTED)
+                        PERFORM_SYSTEM_TEST(cpu_armel_check.cpp "ARM EL" ARMEL_SUPPORTED)
+                        IF(ARMEL_SUPPORTED)
+                                SET(ADM_CPU_ARMEL 1)
+                        ENDIF(ARMEL_SUPPORTED)
+	        ENDIF (X86_32_SUPPORTED)
+        ENDIF (X86_64_SUPPORTED)
+
+        IF (NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_ARMEL)
+	        MESSAGE(FATAL_ERROR "CPU not supported")
+        ENDIF (NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_ARMEL)
+
+        TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN)
+
+        IF (CMAKE_WORDS_BIGENDIAN)
+	        SET(ADM_BIG_ENDIAN 1)
+        ENDIF (CMAKE_WORDS_BIGENDIAN)
+ELSE(NOT MSVC)
+        MESSAGE(STATUS "Microsoft compiler, skipping CPU TEST")
+        IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
+	        SET(ADM_CPU_64BIT 1)
+        ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ENDIF(NOT MSVC)
 
 MESSAGE("")

avidemux_2.6.15.tar.gz/cmake/admFFmpegBuild.cmake -> avidemux_2.6.16.tar.gz/cmake/admFFmpegBuild.cmake Changed

@@ -1,419 +1,16 @@
-MACRO (xadd opt)
-	if ("${ARGV1}" STREQUAL "")
-		set(FFMPEG_FLAGS "${FFMPEG_FLAGS} ${opt}")
-	else ("${ARGV1}" STREQUAL "")
-		string(STRIP ${ARGV1} arg)
-		set(FFMPEG_FLAGS "${FFMPEG_FLAGS} ${opt}=\"${arg}\"")
-	endif ("${ARGV1}" STREQUAL "")
-ENDMACRO (xadd)
-
-option(FF_INHERIT_BUILD_ENV "" ON)
-
-set(FFMPEG_VERSION "3.0.3")
-set(FFMPEG_ROOT_DIR "${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ffmpeg_package")
-set(FFMPEG_PATCH_DIR  "${FFMPEG_ROOT_DIR}/patches/")
-set(FFMPEG_SOURCE_ARCHIVE "ffmpeg-${FFMPEG_VERSION}.tar.bz2")
-set(FFMPEG_SOURCE_ARCHIVE_DIR "ffmpeg-${FFMPEG_VERSION}")
-set(FFMPEG_EXTRACT_DIR "${CMAKE_BINARY_DIR}")
-set(FFMPEG_BASE_DIR "${FFMPEG_EXTRACT_DIR}/ffmpeg")
-set(FFMPEG_SOURCE_DIR "${FFMPEG_BASE_DIR}/source")
-set(FFMPEG_BINARY_DIR "${FFMPEG_BASE_DIR}/build")
-
-set(FFMPEG_DECODERS  aac ac3 eac3 adpcm_ima_amv  amv  bmp  cinepak  cyuv  dca  dvbsub  dvvideo  ffv1  ffvhuff  flv  fraps  h263  h264  
-                                         hevc  huffyuv  mjpeg
-					 mjpegb  mpeg2video  mpeg4  msmpeg4v2  msmpeg4v3  msvideo1  nellymoser  png  qdm2  rawvideo  snow
-					 svq3  theora  tscc  mp2 mp3 mp2_float mp3_float
-					 vc1  vp3  vp6  vp6a  vp6f  vp8 vp9 wmapro wmav2  wmv1  wmv2  wmv3 cscd lagarith flac vorbis)
-set(FFMPEG_ENCODERS  ac3  ac3_float dvvideo  ffv1  ffvhuff  flv  h263  huffyuv  mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  snow aac dca flac)
-set(FFMPEG_MUXERS  flv  matroska  mpeg1vcd  mpeg2dvd  mpeg2svcd  mpegts  mov  mp4  psp webm)
-set(FFMPEG_PARSERS  ac3  h263  h264  hevc  mpeg4video)
-set(FFMPEG_PROTOCOLS  file)
-set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc)
-xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-postproc --enable-gpl")
-xadd("--enable-runtime-cpudetect --disable-network ")
-xadd("--enable-swscale --disable-swresample")
-xadd("--disable-doc --disable-programs")
-
-FIND_HEADER_AND_LIB(_X265 x265.h)
-FIND_HEADER_AND_LIB(_X265_CONFIG x265_config.h)
-
-IF (_X265_FOUND AND _X265_CONFIG_FOUND)
-#	xadd("--enable-libx265")
-#	message("adding --enable-libx265 to ffmpeg protocols")
-ENDIF (_X265_FOUND AND _X265_CONFIG_FOUND)
-xadd("--disable-libx265")
-xadd("--disable-libx264")
-IF(USE_NVENC)
-   SET(FFMPEG_ENCODERS ${FFMPEG_ENCODERS} nvenc)
-   xadd("--enable-nonfree")
-   xadd("--enable-nvenc")
-   set(FFMPEG_ENCODERS  ${FFMPEG_ENCODERS} nvenc_h264 nvenc_hevc)
-ENDIF(USE_NVENC)
-
-if (NOT CROSS)
-	xadd(--prefix ${CMAKE_INSTALL_PREFIX})
-endif (NOT CROSS)
-
-# Clean FFmpeg
-set_directory_properties(${CMAKE_CURRENT_BINARY_DIR} ADDITIONAL_MAKE_CLEAN_FILES "${FFMPEG_BASE_DIR}")
-
-# Prepare FFmpeg source
-include(admFFmpegUtil)
-include(admFFmpegPrepareTar)
-
-if (NOT FFMPEG_PREPARED)
-	include(admFFmpegPrepareGit)
-endif (NOT FFMPEG_PREPARED)
-
-message("")
-
-if (FFMPEG_PERFORM_PATCH)
-	find_package(Patch)
-
-        # my patches
-	file(GLOB patchFiles "${FFMPEG_PATCH_DIR}/*.patch")
-
-	foreach(patchFile ${patchFiles})
-                get_filename_component(short ${patchFile}  NAME)
-                MESSAGE(STATUS "-- Mine, Applying patch <${short}> --")
-		patch_file("${FFMPEG_SOURCE_DIR}" "${patchFile}")
-	endforeach(patchFile)
-        # XVBA patch from xbmc_dxva
-        IF(XVBA_NOT_ENABLED_FOR_NOW) #<-------------------
-	file(GLOB patchFilesXvba "${FFMPEG_PATCH_DIR}/xvba/*.patch")
-
-	foreach(patchFileXvba ${patchFilesXvba})
-                get_filename_component(short ${patchFileXvba}  NAME)
-                MESSAGE(STATUS "-- DXVA, Applying patch <${short}> --")
-		patch_file_p1("${FFMPEG_SOURCE_DIR}" "${patchFileXvba}")
-	endforeach(patchFileXvba)
-        ENDIF(XVBA_NOT_ENABLED_FOR_NOW) #<-------------------
-        
-        #
-	if (UNIX )
-			MESSAGE(STATUS "Patching Linux common.mak")
-			patch_file("${FFMPEG_SOURCE_DIR}" "${FFMPEG_PATCH_DIR}/common.mak.diff") 
-	endif (UNIX )
-        IF(WIN32)
-                IF("${CROSS_C_COMPILER}" STREQUAL "clang")
-			patch_file("${FFMPEG_SOURCE_DIR}" "${FFMPEG_PATCH_DIR}/clang_win32_workaround.diff")
-                ENDIF("${CROSS_C_COMPILER}" STREQUAL "clang")
-        ENDIF(WIN32)
-
-	message("")
-endif (FFMPEG_PERFORM_PATCH)
-
-if (USE_VDPAU)
-	xadd(--enable-vdpau)
-	set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_vdpau  vc1_vdpau  mpeg1_vdpau  mpeg_vdpau  wmv3_vdpau)
-endif (USE_VDPAU)
-
-if (USE_LIBVA)
-	xadd(--enable-vaapi)
-	set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_vaapi hevc_vaapi)
-endif (USE_LIBVA)
-
-
-#if(USE_XVBA)
-	#xadd(--enable-xvba)
-#else(USE_XVBA)
-	#xadd(--disable-xvba)
-#endif(USE_XVBA)
-
-
-
-# Configure FFmpeg, if required
-foreach (decoder ${FFMPEG_DECODERS})
-	xadd(--enable-decoder ${decoder})
-endforeach (decoder)
-
-foreach (encoder ${FFMPEG_ENCODERS})
-	xadd(--enable-encoder ${encoder})
-endforeach (encoder)
-
-foreach (muxer ${FFMPEG_MUXERS})
-	xadd(--enable-muxer ${muxer})
-endforeach (muxer)
-
-foreach (parser ${FFMPEG_PARSERS})
-	xadd(--enable-parser ${parser})
-endforeach (parser)
-
-foreach (protocol ${FFMPEG_PROTOCOLS})
-	xadd(--enable-protocol ${protocol})
-endforeach (protocol)
-
-foreach (bistream ${FFMPEG_BSFS})
-	xadd(--enable-bsf ${bistream})
-endforeach (bistream)
-
-if (WIN32)
-	if (ADM_CPU_X86_32)
-                IF("${CROSS_C_COMPILER}" STREQUAL "clang")
-                        # With clang we use the -mstackrealign -mstack-alignment=16
-                ELSE("${CROSS_C_COMPILER}" STREQUAL "clang")
-                        # Old win32, for hack, not sure it really works with recent gcc
-		        xadd(--enable-memalign-hack)
-                ENDIF("${CROSS_C_COMPILER}" STREQUAL "clang")
-	endif (ADM_CPU_X86_32)
-
-	xadd(--enable-w32threads)
-else (WIN32)
-	xadd(--enable-pthreads)
-endif (WIN32)
-
-if (NOT ADM_DEBUG)
-	xadd(--disable-debug)
-endif (NOT ADM_DEBUG)
-
-#  Cross compiler override (win32 & win64)
-if (CROSS)
-	if(APPLE)
-		xadd(--prefix /opt/mac)
-		xadd(--host-cc gcc)
-		xadd(--nm ${CMAKE_CROSS_PREFIX}-nm) 
-		xadd(--strip ${CMAKE_CROSS_PREFIX}-strip) 
-
-		set(CROSS_OS darwin)
-		set(CROSS_ARCH i386)
-	else(APPLE)
-		xadd(--prefix ${CROSS})
-		xadd(--host-cc gcc)
-		xadd(--nm ${CMAKE_CROSS_PREFIX}-nm) 
-		xadd(--extra-cflags  -I${CROSS}/include)
-		if (CMAKE_C_FLAGS)
-			xadd(--extra-cflags ${CMAKE_C_FLAGS})
-                        xadd(--extra-ldflags ${CMAKE_C_FLAGS})
-		endif (CMAKE_C_FLAGS)
-
-		set(CROSS_OS mingw32)	
-
-		if (ADM_CPU_64BIT)
-			set(CROSS_ARCH x86_64)
-		else (ADM_CPU_64BIT)
-			set(CROSS_ARCH i386)
-		endif (ADM_CPU_64BIT)
-	endif(APPLE)
-
-	message(STATUS "Using cross compilation flag: ${FFMPEG_FLAGS}")
-endif (CROSS)
-
-if (FF_INHERIT_BUILD_ENV)
-	xadd(--cc "${CMAKE_C_COMPILER}")
-	xadd(--ld "${CMAKE_C_COMPILER}")
-	xadd(--ar "${CMAKE_AR}")
-	# nm should be ok if we do not cross compile
-        if(CMAKE_LD_FLAGS)
-		xadd(--extra-ldflags ${CMAKE_LD_FLAGS})
-        endif(CMAKE_LD_FLAGS)
-	if (CMAKE_C_FLAGS)
-		xadd(--extra-cflags ${CMAKE_C_FLAGS})
-	endif (CMAKE_C_FLAGS)
-
-	if (CMAKE_SHARED_LINKER_FLAGS)
-		xadd(--extra-ldflags ${CMAKE_SHARED_LINKER_FLAGS})
-	endif (CMAKE_SHARED_LINKER_FLAGS)
-
-	if (VERBOSE)
-		# for ffmpeg to use the same  compiler as others
-		MESSAGE(STATUS "Building ffmpeg with CC=${CMAKE_C_COMPILER}")
-		MESSAGE(STATUS "Building ffmpeg with LD=${CMAKE_C_COMPILER}")
-		MESSAGE(STATUS "Building ffmpeg with AR=${CMAKE_AR}")
-		MESSAGE(STATUS "Building ffmpeg with CMAKE_C_FLAGS=${CMAKE_C_FLAGS}")
-		MESSAGE(STATUS "Building ffmpeg with CFLAGS=${FF_FLAGS}")
-		MESSAGE(STATUS "Building ffmpeg with CFLAGS2=${FFMPEG_FLAGS}")
-		message("")
-	endif (VERBOSE)
-endif (FF_INHERIT_BUILD_ENV)
-
-if (CROSS_ARCH OR CROSS_OS)
-	xadd(--enable-cross-compile)
-endif (CROSS_ARCH OR CROSS_OS)
-
-if (CROSS_ARCH)
-	set(CROSS_ARCH "${CROSS_ARCH}" CACHE STRING "")
-	xadd(--arch ${CROSS_ARCH})
-endif (CROSS_ARCH)
-
-if (CROSS_OS)
-	set(CROSS_OS "${CROSS_OS}" CACHE STRING "")
-	xadd(--target-os ${CROSS_OS})
-endif (CROSS_OS)
-
-if (FF_FLAGS)
-	set(FF_FLAGS "${FF_FLAGS}" CACHE STRING "")
-	xadd(${FF_FLAGS})
-endif (FF_FLAGS)
 IF(WIN32)
-        IF(USE_DXVA2)
-                xadd(--enable-dxva2)
-	        set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_dxva2 hevc_dxva2)
-        ENDIF(USE_DXVA2)
+        IF(CROSS)
+                MESSAGE(STATUS "Using mingw Cross compiler setup")
+                include(admFFmpegBuild_crossMingw)
+        ELSE(CROSS)          
+             IF(NOT VS_IMPORT)      
+                include(admFFmpegBuild_vs)
+             ELSE(NOT VS_IMPORT)      
+                include(admFFmpegBuild_vs_import)
+             ENDIF(NOT VS_IMPORT)      
+        ENDIF(CROSS)
+
+ELSE(WIN32)
+        MESSAGE(STATUS "Using native unix setup")
+        include(admFFmpegBuild_native)
 ENDIF(WIN32)
-
-if (NOT "${LAST_FFMPEG_FLAGS}" STREQUAL "${FFMPEG_FLAGS}")
-	set(FFMPEG_PERFORM_BUILD 1)
-endif (NOT "${LAST_FFMPEG_FLAGS}" STREQUAL "${FFMPEG_FLAGS}")
-
-if (NOT EXISTS "${FFMPEG_BINARY_DIR}/Makefile")
-	set(FFMPEG_PERFORM_BUILD 1)
-endif (NOT EXISTS "${FFMPEG_BINARY_DIR}/Makefile")
-
-if (FFMPEG_PERFORM_BUILD)
-	find_package(Bourne)
-	find_package(GnuMake)
-
-	message(STATUS "Configuring FFmpeg")
-	set(LAST_FFMPEG_FLAGS "${FFMPEG_FLAGS}" CACHE STRING "" FORCE)
-
-	file(MAKE_DIRECTORY "${FFMPEG_BINARY_DIR}")
-	file(REMOVE "${FFMPEG_BINARY_DIR}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}")
-	file(REMOVE "${FFMPEG_BINARY_DIR}/ffmpeg_g${CMAKE_EXECUTABLE_SUFFIX}")
-
-	set(ffmpeg_bash_directory ${BASH_EXECUTABLE})
-	convertPathToUnix(ffmpeg_bash_directory ${BASH_EXECUTABLE})
-	get_filename_component(ffmpeg_bash_directory ${ffmpeg_bash_directory} PATH)
-	configure_file("${AVIDEMUX_TOP_SOURCE_DIR}/cmake/ffmpeg_configure.sh.cmake" "${FFMPEG_BINARY_DIR}/ffmpeg_configure.sh")
-
-	execute_process(COMMAND ${BASH_EXECUTABLE} ffmpeg_configure.sh WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}"
-					OUTPUT_VARIABLE FFMPEG_CONFIGURE_OUTPUT RESULT_VARIABLE FFMPEG_CONFIGURE_RESULT)
-
-    if (NOT (FFMPEG_CONFIGURE_RESULT EQUAL 0))
-	    MESSAGE(ERROR "configure returned <${FFMPEG_CONFIGURE_RESULT}>")
-	    MESSAGE(ERROR "configure output is <${FFMPEG_CONFIGURE_OUTPUT}>")
-		MESSAGE(FATAL_ERROR "An error occured ")
-    endif (NOT (FFMPEG_CONFIGURE_RESULT EQUAL 0))
-
-	MESSAGE(STATUS "Configuring done, processing")
-
-	if (ADM_CPU_X86)
-		file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H)
-		string(REGEX MATCH "#define[ ]+HAVE_YASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
-
-		if (NOT FF_YASM)
-			message(FATAL_ERROR "Yasm was not found.")
-		endif (NOT FF_YASM)
-	endif (ADM_CPU_X86)
-
-	execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "libavutil"
-					WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/config")
-
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy "./libavutil/avconfig.h" "${CMAKE_BINARY_DIR}/config/libavutil"
-					WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
-
-	   if (UNIX)
-		find_package(Patch)
-		IF(APPLE)
-			MESSAGE(STATUS "Patching config.mak - mac(2)")
-			patch_file("${FFMPEG_BINARY_DIR}" "${FFMPEG_PATCH_DIR}/config.mak.mac.diff")
-		ELSE(APPLE)
-			MESSAGE(STATUS "Patching config.mak - linux (2)")
-			patch_file("${FFMPEG_BINARY_DIR}" "${FFMPEG_PATCH_DIR}/config.mak.diff")
-		ENDIF(APPLE)
-	   endif (UNIX)
-
-	message("")
-endif (FFMPEG_PERFORM_BUILD)
-
-# Build FFmpeg
-getFfmpegLibNames("${FFMPEG_SOURCE_DIR}")
-
-set(ffmpeg_gnumake_executable ${GNUMAKE_EXECUTABLE})
-convertPathToUnix(ffmpeg_gnumake_executable ${BASH_EXECUTABLE})
-configure_file("${AVIDEMUX_TOP_SOURCE_DIR}/cmake/ffmpeg_make.sh.cmake" "${FFMPEG_BINARY_DIR}/ffmpeg_make.sh")
-registerFFmpeg("${FFMPEG_SOURCE_DIR}" "${FFMPEG_BINARY_DIR}" 0)
-
-if(CMAKE_HOST_UNIX)
-        add_custom_target(         libavutil_dummy
-                                   COMMAND ${CMAKE_BUILD_TOOL}  -j 4 # We assume make or gnumake when host is unix
-                                   WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
-else(CMAKE_HOST_UNIX)
-        add_custom_target(         libavutil_dummy
-				   COMMAND ${BASH_EXECUTABLE} ffmpeg_make.sh  # Host is win32, wrap
-                                   WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
-endif(CMAKE_HOST_UNIX)
-
-
-MACRO(FF_ADD_SUBLIB lib)
-        add_custom_command(
-				   OUTPUT       "${lib}"	
-                                   DEPENDS 	libavutil_dummy
-				   COMMAND ${BASH_EXECUTABLE} -c echo "placeHolder")
-
-ENDMACRO(FF_ADD_SUBLIB lib)
-
-FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"       )
-FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"       )
-FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"   )
-FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"   )
-FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"     )
-
-
-MACRO(FF_ADD_SUBLIB lib)
-        add_custom_command(
-				   OUTPUT       "${lib}"	
-                                   DEPENDS 	"${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"
-				   COMMAND ${BASH_EXECUTABLE} -c echo "placeHolder")
-
-ENDMACRO(FF_ADD_SUBLIB lib)
-
-FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"       )
-FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"   )
-FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"   )
-FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"     )
-
-
-# Add and INSTALL libraries
-include_directories("${FFMPEG_SOURCE_DIR}")
-include_directories("${FFMPEG_BINARY_DIR}")
-
-ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}")
-ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}")
-ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}")
-ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}")
-ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}")
-
-INSTALL(FILES "${FFMPEG_BINARY_DIR}/libavutil/avconfig.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev) 
-IF(USE_LIBVA)
-        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/vaapi.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev) 
-        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/vaapi_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev) 
-ENDIF(USE_LIBVA)
-
-IF(USE_DXVA2)
-        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev) 
-        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev) 
-ENDIF(USE_DXVA2)
-IF(USE_XVBA)
-        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/xvba.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev) 
-        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/xvba_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev) 
-ENDIF(USE_XVBA)
-INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/avcodec.h" "${FFMPEG_SOURCE_DIR}/libavcodec/vdpau.h"
-	"${FFMPEG_SOURCE_DIR}/libavcodec/version.h" 
-	"${FFMPEG_SOURCE_DIR}/libavcodec/audioconvert.h"
-	#"${FFMPEG_SOURCE_DIR}/libavcodec/internal.h" 
-	DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
-INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavformat/avformat.h" "${FFMPEG_SOURCE_DIR}/libavformat/avio.h"
-	"${FFMPEG_SOURCE_DIR}/libavformat/version.h" 
-	"${FFMPEG_SOURCE_DIR}/libavformat/flv.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavformat" COMPONENT dev)
-INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavutil/attributes.h" "${FFMPEG_SOURCE_DIR}/libavutil/avutil.h" 
-	"${FFMPEG_SOURCE_DIR}/libavutil/buffer.h"
-	"${FFMPEG_SOURCE_DIR}/libavutil/bswap.h" "${FFMPEG_SOURCE_DIR}/libavutil/common.h"
-	"${FFMPEG_SOURCE_DIR}/libavutil/cpu.h" "${FFMPEG_SOURCE_DIR}/libavutil/frame.h"
-	"${FFMPEG_SOURCE_DIR}/libavutil/log.h" "${FFMPEG_SOURCE_DIR}/libavutil/mathematics.h"
-	"${FFMPEG_SOURCE_DIR}/libavutil/mem.h" "${FFMPEG_SOURCE_DIR}/libavutil/pixfmt.h"
-	"${FFMPEG_SOURCE_DIR}/libavutil/pixdesc.h"
-	"${FFMPEG_SOURCE_DIR}/libavutil/channel_layout.h" 
-	"${FFMPEG_SOURCE_DIR}/libavutil/error.h" 
-	"${FFMPEG_SOURCE_DIR}/libavutil/dict.h" 
-	"${FFMPEG_SOURCE_DIR}/libavutil/version.h" 
-	"${FFMPEG_SOURCE_DIR}/libavutil/time.h" 
-	"${FFMPEG_SOURCE_DIR}/libavutil/opt.h" 
-	"${FFMPEG_SOURCE_DIR}/libavutil/intfloat.h" 
-	"${FFMPEG_SOURCE_DIR}/libavutil/macros.h" 
-	"${FFMPEG_SOURCE_DIR}/libavutil/samplefmt.h" 
-	"${FFMPEG_SOURCE_DIR}/libavutil/rational.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev)
-INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/postprocess.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
-INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
-INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/swscale.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)
-INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)
-

avidemux_2.6.16.tar.gz/cmake/admFFmpegBuild.cmake.original Added

@@ -0,0 +1,418 @@
+MACRO (xadd opt)
+	if ("${ARGV1}" STREQUAL "")
+		set(FFMPEG_FLAGS "${FFMPEG_FLAGS} ${opt}")
+	else ("${ARGV1}" STREQUAL "")
+		string(STRIP ${ARGV1} arg)
+		set(FFMPEG_FLAGS "${FFMPEG_FLAGS} ${opt}=\"${arg}\"")
+	endif ("${ARGV1}" STREQUAL "")
+ENDMACRO (xadd)
+
+option(FF_INHERIT_BUILD_ENV "" ON)
+
+set(FFMPEG_VERSION "3.0.3")
+set(FFMPEG_ROOT_DIR "${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ffmpeg_package")
+set(FFMPEG_PATCH_DIR  "${FFMPEG_ROOT_DIR}/patches/")
+set(FFMPEG_SOURCE_ARCHIVE "ffmpeg-${FFMPEG_VERSION}.tar.bz2")
+set(FFMPEG_SOURCE_ARCHIVE_DIR "ffmpeg-${FFMPEG_VERSION}")
+set(FFMPEG_EXTRACT_DIR "${CMAKE_BINARY_DIR}")
+set(FFMPEG_BASE_DIR "${FFMPEG_EXTRACT_DIR}/ffmpeg")
+set(FFMPEG_SOURCE_DIR "${FFMPEG_BASE_DIR}/source")
+set(FFMPEG_BINARY_DIR "${FFMPEG_BASE_DIR}/build")
+
+set(FFMPEG_DECODERS  aac ac3 eac3 adpcm_ima_amv  amv  bmp  cinepak  cyuv  dca  dvbsub  dvvideo  ffv1  ffvhuff  flv  fraps  h263  h264
+                                         hevc  huffyuv  mjpeg
+					 mjpegb  mpeg2video  mpeg4  msmpeg4v2  msmpeg4v3  msvideo1  nellymoser  png  qdm2  rawvideo  snow
+					 svq3  theora  tscc  mp2 mp3 mp2_float mp3_float
+					 vc1  vp3  vp6  vp6a  vp6f  vp8 vp9 wmapro wmav2  wmv1  wmv2  wmv3 cscd lagarith flac vorbis)
+set(FFMPEG_ENCODERS  ac3  ac3_float dvvideo  ffv1  ffvhuff  flv  h263  huffyuv  mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  snow aac dca flac)
+set(FFMPEG_MUXERS  flv  matroska  mpeg1vcd  mpeg2dvd  mpeg2svcd  mpegts  mov  mp4  psp webm)
+set(FFMPEG_PARSERS  ac3  h263  h264  hevc  mpeg4video)
+set(FFMPEG_PROTOCOLS  file)
+set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc)
+xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-postproc --enable-gpl")
+xadd("--enable-runtime-cpudetect --disable-network ")
+xadd("--enable-swscale --disable-swresample")
+xadd("--disable-doc --disable-programs")
+
+FIND_HEADER_AND_LIB(_X265 x265.h)
+FIND_HEADER_AND_LIB(_X265_CONFIG x265_config.h)
+
+IF (_X265_FOUND AND _X265_CONFIG_FOUND)
+#	xadd("--enable-libx265")
+#	message("adding --enable-libx265 to ffmpeg protocols")
+ENDIF (_X265_FOUND AND _X265_CONFIG_FOUND)
+xadd("--disable-libx265")
+xadd("--disable-libx264")
+IF(USE_NVENC)
+   SET(FFMPEG_ENCODERS ${FFMPEG_ENCODERS} nvenc)
+   xadd("--enable-nonfree")
+   xadd("--enable-nvenc")
+   set(FFMPEG_ENCODERS  ${FFMPEG_ENCODERS} nvenc_h264 nvenc_hevc)
+ENDIF(USE_NVENC)
+
+if (NOT CROSS)
+	xadd(--prefix ${CMAKE_INSTALL_PREFIX})
+endif (NOT CROSS)
+
+# Clean FFmpeg
+set_directory_properties(${CMAKE_CURRENT_BINARY_DIR} ADDITIONAL_MAKE_CLEAN_FILES "${FFMPEG_BASE_DIR}")
+
+# Prepare FFmpeg source
+include(admFFmpegUtil)
+include(admFFmpegPrepareTar)
+
+if (NOT FFMPEG_PREPARED)
+	include(admFFmpegPrepareGit)
+endif (NOT FFMPEG_PREPARED)
+
+message("")
+
+if (FFMPEG_PERFORM_PATCH)
+	find_package(Patch)
+
+        # my patches
+	file(GLOB patchFiles "${FFMPEG_PATCH_DIR}/*.patch")
+
+	foreach(patchFile ${patchFiles})
+                get_filename_component(short ${patchFile}  NAME)
+                MESSAGE(STATUS "-- Mine, Applying patch <${short}> --")
+		patch_file("${FFMPEG_SOURCE_DIR}" "${patchFile}")
+	endforeach(patchFile)
+        # XVBA patch from xbmc_dxva
+        IF(XVBA_NOT_ENABLED_FOR_NOW) #<-------------------
+	file(GLOB patchFilesXvba "${FFMPEG_PATCH_DIR}/xvba/*.patch")
+
+	foreach(patchFileXvba ${patchFilesXvba})
+                get_filename_component(short ${patchFileXvba}  NAME)
+                MESSAGE(STATUS "-- DXVA, Applying patch <${short}> --")
+		patch_file_p1("${FFMPEG_SOURCE_DIR}" "${patchFileXvba}")
+	endforeach(patchFileXvba)
+        ENDIF(XVBA_NOT_ENABLED_FOR_NOW) #<-------------------
+
+        #
+	if (UNIX )
+			MESSAGE(STATUS "Patching Linux common.mak")
+			patch_file("${FFMPEG_SOURCE_DIR}" "${FFMPEG_PATCH_DIR}/common.mak.diff")
+	endif (UNIX )
+        IF(WIN32)
+                IF("${CROSS_C_COMPILER}" STREQUAL "clang")
+			patch_file("${FFMPEG_SOURCE_DIR}" "${FFMPEG_PATCH_DIR}/clang_win32_workaround.diff")
+                ENDIF("${CROSS_C_COMPILER}" STREQUAL "clang")
+        ENDIF(WIN32)
+
+	message("")
+endif (FFMPEG_PERFORM_PATCH)
+
+if (USE_VDPAU)
+	xadd(--enable-vdpau)
+	set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_vdpau  vc1_vdpau  mpeg1_vdpau  mpeg_vdpau  wmv3_vdpau)
+endif (USE_VDPAU)
+
+if (USE_LIBVA)
+	xadd(--enable-vaapi)
+	set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_vaapi hevc_vaapi)
+endif (USE_LIBVA)
+
+
+#if(USE_XVBA)
+	#xadd(--enable-xvba)
+#else(USE_XVBA)
+	#xadd(--disable-xvba)
+#endif(USE_XVBA)
+
+
+
+# Configure FFmpeg, if required
+foreach (decoder ${FFMPEG_DECODERS})
+	xadd(--enable-decoder ${decoder})
+endforeach (decoder)
+
+foreach (encoder ${FFMPEG_ENCODERS})
+	xadd(--enable-encoder ${encoder})
+endforeach (encoder)
+
+foreach (muxer ${FFMPEG_MUXERS})
+	xadd(--enable-muxer ${muxer})
+endforeach (muxer)
+
+foreach (parser ${FFMPEG_PARSERS})
+	xadd(--enable-parser ${parser})
+endforeach (parser)
+
+foreach (protocol ${FFMPEG_PROTOCOLS})
+	xadd(--enable-protocol ${protocol})
+endforeach (protocol)
+
+foreach (bistream ${FFMPEG_BSFS})
+	xadd(--enable-bsf ${bistream})
+endforeach (bistream)
+
+if (WIN32)
+	if (ADM_CPU_X86_32)
+                IF("${CROSS_C_COMPILER}" STREQUAL "clang")
+                        # With clang we use the -mstackrealign -mstack-alignment=16
+                ELSE("${CROSS_C_COMPILER}" STREQUAL "clang")
+                        # Old win32, for hack, not sure it really works with recent gcc
+		        xadd(--enable-memalign-hack)
+                ENDIF("${CROSS_C_COMPILER}" STREQUAL "clang")
+	endif (ADM_CPU_X86_32)
+
+	xadd(--enable-w32threads)
+else (WIN32)
+	xadd(--enable-pthreads)
+endif (WIN32)
+
+if (NOT ADM_DEBUG)
+	xadd(--disable-debug)
+endif (NOT ADM_DEBUG)
+
+#  Cross compiler override (win32 & win64)
+if (CROSS)
+	if(APPLE)
+		xadd(--prefix /opt/mac)
+		xadd(--host-cc gcc)
+		xadd(--nm ${CMAKE_CROSS_PREFIX}-nm)
+		xadd(--strip ${CMAKE_CROSS_PREFIX}-strip)
+
+		set(CROSS_OS darwin)
+		set(CROSS_ARCH i386)
+	else(APPLE)
+		xadd(--prefix ${CROSS})
+		xadd(--host-cc gcc)
+		xadd(--nm ${CMAKE_CROSS_PREFIX}-nm)
+		xadd(--extra-cflags  -I${CROSS}/include)
+		if (CMAKE_C_FLAGS)
+			xadd(--extra-cflags ${CMAKE_C_FLAGS})
+                        xadd(--extra-ldflags ${CMAKE_C_FLAGS})
+		endif (CMAKE_C_FLAGS)
+
+		set(CROSS_OS mingw32)
+
+		if (ADM_CPU_64BIT)
+			set(CROSS_ARCH x86_64)
+		else (ADM_CPU_64BIT)
+			set(CROSS_ARCH i386)
+		endif (ADM_CPU_64BIT)
+	endif(APPLE)
+
+	message(STATUS "Using cross compilation flag: ${FFMPEG_FLAGS}")
+endif (CROSS)
+
+if (FF_INHERIT_BUILD_ENV)
+	xadd(--cc "${CMAKE_C_COMPILER}")
+	xadd(--ld "${CMAKE_C_COMPILER}")
+	xadd(--ar "${CMAKE_AR}")
+	# nm should be ok if we do not cross compile
+        if(CMAKE_LD_FLAGS)
+		xadd(--extra-ldflags ${CMAKE_LD_FLAGS})
+        endif(CMAKE_LD_FLAGS)
+	if (CMAKE_C_FLAGS)
+		xadd(--extra-cflags ${CMAKE_C_FLAGS})
+	endif (CMAKE_C_FLAGS)
+
+	if (CMAKE_SHARED_LINKER_FLAGS)
+		xadd(--extra-ldflags ${CMAKE_SHARED_LINKER_FLAGS})
+	endif (CMAKE_SHARED_LINKER_FLAGS)
+
+	if (VERBOSE)
+		# for ffmpeg to use the same  compiler as others
+		MESSAGE(STATUS "Building ffmpeg with CC=${CMAKE_C_COMPILER}")
+		MESSAGE(STATUS "Building ffmpeg with LD=${CMAKE_C_COMPILER}")
+		MESSAGE(STATUS "Building ffmpeg with AR=${CMAKE_AR}")
+		MESSAGE(STATUS "Building ffmpeg with CMAKE_C_FLAGS=${CMAKE_C_FLAGS}")
+		MESSAGE(STATUS "Building ffmpeg with CFLAGS=${FF_FLAGS}")
+		MESSAGE(STATUS "Building ffmpeg with CFLAGS2=${FFMPEG_FLAGS}")
+		message("")
+	endif (VERBOSE)
+endif (FF_INHERIT_BUILD_ENV)
+
+if (CROSS_ARCH OR CROSS_OS)
+	xadd(--enable-cross-compile)
+endif (CROSS_ARCH OR CROSS_OS)
+
+if (CROSS_ARCH)
+	set(CROSS_ARCH "${CROSS_ARCH}" CACHE STRING "")
+	xadd(--arch ${CROSS_ARCH})
+endif (CROSS_ARCH)
+
+if (CROSS_OS)
+	set(CROSS_OS "${CROSS_OS}" CACHE STRING "")
+	xadd(--target-os ${CROSS_OS})
+endif (CROSS_OS)
+
+if (FF_FLAGS)
+	set(FF_FLAGS "${FF_FLAGS}" CACHE STRING "")
+	xadd(${FF_FLAGS})
+endif (FF_FLAGS)
+IF(WIN32)
+        IF(USE_DXVA2)
+                xadd(--enable-dxva2)
+	        set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_dxva2 hevc_dxva2)
+        ENDIF(USE_DXVA2)
+ENDIF(WIN32)
+
+if (NOT "${LAST_FFMPEG_FLAGS}" STREQUAL "${FFMPEG_FLAGS}")
+	set(FFMPEG_PERFORM_BUILD 1)
+endif (NOT "${LAST_FFMPEG_FLAGS}" STREQUAL "${FFMPEG_FLAGS}")
+
+if (NOT EXISTS "${FFMPEG_BINARY_DIR}/Makefile")
+	set(FFMPEG_PERFORM_BUILD 1)
+endif (NOT EXISTS "${FFMPEG_BINARY_DIR}/Makefile")
+
+if (FFMPEG_PERFORM_BUILD)
+	find_package(Bourne)
+	find_package(GnuMake)
+
+	message(STATUS "Configuring FFmpeg")
+	set(LAST_FFMPEG_FLAGS "${FFMPEG_FLAGS}" CACHE STRING "" FORCE)
+
+	file(MAKE_DIRECTORY "${FFMPEG_BINARY_DIR}")
+	file(REMOVE "${FFMPEG_BINARY_DIR}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}")
+	file(REMOVE "${FFMPEG_BINARY_DIR}/ffmpeg_g${CMAKE_EXECUTABLE_SUFFIX}")
+
+	set(ffmpeg_bash_directory ${BASH_EXECUTABLE})
+	convertPathToUnix(ffmpeg_bash_directory ${BASH_EXECUTABLE})
+	get_filename_component(ffmpeg_bash_directory ${ffmpeg_bash_directory} PATH)
+	configure_file("${AVIDEMUX_TOP_SOURCE_DIR}/cmake/ffmpeg_configure.sh.cmake" "${FFMPEG_BINARY_DIR}/ffmpeg_configure.sh")
+
+	execute_process(COMMAND ${BASH_EXECUTABLE} ffmpeg_configure.sh WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}"
+					OUTPUT_VARIABLE FFMPEG_CONFIGURE_OUTPUT RESULT_VARIABLE FFMPEG_CONFIGURE_RESULT)
+
+    if (NOT (FFMPEG_CONFIGURE_RESULT EQUAL 0))
+	    MESSAGE(ERROR "configure returned <${FFMPEG_CONFIGURE_RESULT}>")
+	    MESSAGE(ERROR "configure output is <${FFMPEG_CONFIGURE_OUTPUT}>")
+		MESSAGE(FATAL_ERROR "An error occured ")
+    endif (NOT (FFMPEG_CONFIGURE_RESULT EQUAL 0))
+
+	MESSAGE(STATUS "Configuring done, processing")
+
+	if (ADM_CPU_X86)
+		file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H)
+		string(REGEX MATCH "#define[ ]+HAVE_YASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
+
+		if (NOT FF_YASM)
+			message(FATAL_ERROR "Yasm was not found.")
+		endif (NOT FF_YASM)
+	endif (ADM_CPU_X86)
+
+	execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "libavutil"
+					WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/config")
+
+	execute_process(COMMAND ${CMAKE_COMMAND} -E copy "./libavutil/avconfig.h" "${CMAKE_BINARY_DIR}/config/libavutil"
+					WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
+
+	   if (UNIX)
+		find_package(Patch)
+		IF(APPLE)
+			MESSAGE(STATUS "Patching config.mak - mac(2)")
+			patch_file("${FFMPEG_BINARY_DIR}" "${FFMPEG_PATCH_DIR}/config.mak.mac.diff")
+		ELSE(APPLE)
+			MESSAGE(STATUS "Patching config.mak - linux (2)")
+			patch_file("${FFMPEG_BINARY_DIR}" "${FFMPEG_PATCH_DIR}/config.mak.diff")
+		ENDIF(APPLE)
+	   endif (UNIX)
+
+	message("")
+endif (FFMPEG_PERFORM_BUILD)
+
+# Build FFmpeg
+getFfmpegLibNames("${FFMPEG_SOURCE_DIR}")
+
+set(ffmpeg_gnumake_executable ${GNUMAKE_EXECUTABLE})
+convertPathToUnix(ffmpeg_gnumake_executable ${BASH_EXECUTABLE})
+configure_file("${AVIDEMUX_TOP_SOURCE_DIR}/cmake/ffmpeg_make.sh.cmake" "${FFMPEG_BINARY_DIR}/ffmpeg_make.sh")
+registerFFmpeg("${FFMPEG_SOURCE_DIR}" "${FFMPEG_BINARY_DIR}" 0)
+
+if(CMAKE_HOST_UNIX)
+        add_custom_target(         libavutil_dummy
+                                   COMMAND ${CMAKE_BUILD_TOOL}  -j 4 # We assume make or gnumake when host is unix
+                                   WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
+else(CMAKE_HOST_UNIX)
+        add_custom_target(         libavutil_dummy
+				   COMMAND ${BASH_EXECUTABLE} ffmpeg_make.sh  # Host is win32, wrap
+                                   WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
+endif(CMAKE_HOST_UNIX)
+
+
+MACRO(FF_ADD_SUBLIB lib)
+        add_custom_command(
+				   OUTPUT       "${lib}"
+                                   DEPENDS 	libavutil_dummy
+				   COMMAND ${BASH_EXECUTABLE} -c echo "placeHolder")
+
+ENDMACRO(FF_ADD_SUBLIB lib)
+
+FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"       )
+FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"       )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"     )
+
+
+MACRO(FF_ADD_SUBLIB lib)
+        add_custom_command(
+				   OUTPUT       "${lib}"
+                                   DEPENDS 	"${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"
+				   COMMAND ${BASH_EXECUTABLE} -c echo "placeHolder")
+
+ENDMACRO(FF_ADD_SUBLIB lib)
+
+FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"       )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"     )
+
+
+# Add and INSTALL libraries
+include_directories("${FFMPEG_SOURCE_DIR}")
+include_directories("${FFMPEG_BINARY_DIR}")
+
+ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}")
+ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}")
+ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}")
+ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}")
+ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}")
+
+INSTALL(FILES "${FFMPEG_BINARY_DIR}/libavutil/avconfig.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev)
+IF(USE_LIBVA)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/vaapi.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/vaapi_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+ENDIF(USE_LIBVA)
+
+IF(USE_DXVA2)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+ENDIF(USE_DXVA2)
+IF(USE_XVBA)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/xvba.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/xvba_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+ENDIF(USE_XVBA)
+INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/avcodec.h" "${FFMPEG_SOURCE_DIR}/libavcodec/vdpau.h"
+	"${FFMPEG_SOURCE_DIR}/libavcodec/version.h"
+	"${FFMPEG_SOURCE_DIR}/libavcodec/audioconvert.h"
+	#"${FFMPEG_SOURCE_DIR}/libavcodec/internal.h"
+	DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavformat/avformat.h" "${FFMPEG_SOURCE_DIR}/libavformat/avio.h"
+	"${FFMPEG_SOURCE_DIR}/libavformat/version.h"
+	"${FFMPEG_SOURCE_DIR}/libavformat/flv.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavformat" COMPONENT dev)
+INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavutil/attributes.h" "${FFMPEG_SOURCE_DIR}/libavutil/avutil.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/buffer.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/bswap.h" "${FFMPEG_SOURCE_DIR}/libavutil/common.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/cpu.h" "${FFMPEG_SOURCE_DIR}/libavutil/frame.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/log.h" "${FFMPEG_SOURCE_DIR}/libavutil/mathematics.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/mem.h" "${FFMPEG_SOURCE_DIR}/libavutil/pixfmt.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/pixdesc.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/channel_layout.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/error.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/dict.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/version.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/time.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/opt.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/intfloat.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/macros.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/samplefmt.h"
+	"${FFMPEG_SOURCE_DIR}/libavutil/rational.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev)
+INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/postprocess.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
+INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
+INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/swscale.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)
+INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)

avidemux_2.6.16.tar.gz/cmake/admFFmpegBuild_crossMingw.cmake Added

@@ -0,0 +1,121 @@
+include(admFFmpegBuild_helpers)
+
+#@@
+ADM_FF_SET_DEFAULT()
+
+IF(USE_NVENC)
+   SET(FFMPEG_ENCODERS ${FFMPEG_ENCODERS} nvenc)
+   xadd("--enable-nonfree")
+   xadd("--enable-nvenc")
+   set(FFMPEG_ENCODERS  ${FFMPEG_ENCODERS} nvenc_h264 nvenc_hevc)
+ENDIF(USE_NVENC)
+
+
+
+#@@
+ADM_FF_PATCH_IF_NEEDED()
+
+IF("${CROSS_C_COMPILER}" STREQUAL "clang")
+	patch_file("${FFMPEG_SOURCE_DIR}" "${FFMPEG_PATCH_DIR}/clang_win32_workaround.diff")
+ENDIF("${CROSS_C_COMPILER}" STREQUAL "clang")
+
+
+
+#@@
+ADM_FF_ADD_OPTIONS()
+
+if (ADM_CPU_X86_32)
+        IF("${CROSS_C_COMPILER}" STREQUAL "clang")
+                # With clang we use the -mstackrealign -mstack-alignment=16
+        ELSE("${CROSS_C_COMPILER}" STREQUAL "clang")
+            # Old win32, for hack, not sure it really works with recent gcc
+        		xadd(--enable-memalign-hack)
+        ENDIF("${CROSS_C_COMPILER}" STREQUAL "clang")
+endif (ADM_CPU_X86_32)
+
+xadd(--enable-w32threads)
+
+#  Cross compiler override (win32 & win64)
+xadd(--prefix ${CROSS})
+xadd(--host-cc gcc)
+xadd(--nm ${CMAKE_CROSS_PREFIX}-nm)
+xadd(--extra-cflags  -I${CROSS}/include)
+if (CMAKE_C_FLAGS)
+	xadd(--extra-cflags ${CMAKE_C_FLAGS})
+                    xadd(--extra-ldflags ${CMAKE_C_FLAGS})
+endif (CMAKE_C_FLAGS)
+
+set(CROSS_OS mingw32)
+
+if (ADM_CPU_64BIT)
+		set(CROSS_ARCH x86_64)
+else (ADM_CPU_64BIT)
+		set(CROSS_ARCH i386)
+endif (ADM_CPU_64BIT)
+
+message(STATUS "Using cross compilation flag: ${FFMPEG_FLAGS}")
+
+ADM_FF_ADD_OPTIONS()
+
+
+	xadd(--cc "${CMAKE_C_COMPILER}")
+	xadd(--ld "${CMAKE_C_COMPILER}")
+	xadd(--ar "${CMAKE_AR}")
+
+ADM_FF_SET_EXTRA_FLAGS()
+xadd(--enable-cross-compile)
+
+set(CROSS_ARCH "${CROSS_ARCH}" CACHE STRING "")
+xadd(--arch ${CROSS_ARCH})
+
+set(CROSS_OS "${CROSS_OS}" CACHE STRING "")
+xadd(--target-os ${CROSS_OS})
+
+ADM_FF_SET_EXTRA_FLAGS()
+
+IF(USE_DXVA2)
+      xadd(--enable-dxva2)
+      set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_dxva2 hevc_dxva2)
+ENDIF(USE_DXVA2)
+
+#@@
+ADM_FF_BUILD_UNIX_STYLE()
+ADM_FF_ADD_DUMMY_TARGET()
+MACRO(FF_ADD_SUBLIB lib)
+        add_custom_command(
+				   OUTPUT       "${lib}"
+                                   DEPENDS 	libavutil_dummy
+				   COMMAND ${BASH_EXECUTABLE} -c echo "placeHolder")
+
+ENDMACRO(FF_ADD_SUBLIB lib)
+
+FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"       )
+FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"       )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"     )
+
+
+MACRO(FF_ADD_SUBLIB lib)
+        add_custom_command(
+				   OUTPUT       "${lib}"
+                                   DEPENDS 	"${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"
+				   COMMAND ${BASH_EXECUTABLE} -c echo "placeHolder")
+
+ENDMACRO(FF_ADD_SUBLIB lib)
+
+FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"       )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"     )
+
+ADM_FF_INSTALL_LIBS_AND_HEADERS()
+
+IF(USE_DXVA2)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+ENDIF(USE_DXVA2)
+
+#
+#
+#

avidemux_2.6.16.tar.gz/cmake/admFFmpegBuild_helpers.cmake Added

@@ -0,0 +1,306 @@
+MACRO (xadd opt)
+    if ("${ARGV1}" STREQUAL "")
+        set(FFMPEG_FLAGS "${FFMPEG_FLAGS} ${opt}")
+    else ("${ARGV1}" STREQUAL "")
+        string(STRIP ${ARGV1} arg)
+        set(FFMPEG_FLAGS "${FFMPEG_FLAGS} ${opt}=\"${arg}\"")
+    endif ("${ARGV1}" STREQUAL "")
+ENDMACRO (xadd)
+
+option(FF_INHERIT_BUILD_ENV "" ON)
+find_package(Patch)
+
+set(FFMPEG_VERSION "3.0.5")
+set(FFMPEG_ROOT_DIR "${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ffmpeg_package")
+set(FFMPEG_PATCH_DIR  "${FFMPEG_ROOT_DIR}/patches/")
+set(FFMPEG_SOURCE_ARCHIVE "ffmpeg-${FFMPEG_VERSION}.tar.bz2")
+set(FFMPEG_SOURCE_ARCHIVE_DIR "ffmpeg-${FFMPEG_VERSION}")
+set(FFMPEG_EXTRACT_DIR "${CMAKE_BINARY_DIR}")
+set(FFMPEG_BASE_DIR "${FFMPEG_EXTRACT_DIR}/ffmpeg")
+set(FFMPEG_SOURCE_DIR "${FFMPEG_BASE_DIR}/source")
+set(FFMPEG_BINARY_DIR "${FFMPEG_BASE_DIR}/build")
+
+set(FFMPEG_DECODERS  aac ac3 eac3 adpcm_ima_amv  amv  bmp  cinepak  cyuv  dca  dvbsub  dvvideo  ffv1  ffvhuff  flv  fraps  h263  h264
+                                         hevc  huffyuv  mjpeg
+                     mjpegb  mpeg2video  mpeg4  msmpeg4v2  msmpeg4v3  msvideo1  nellymoser  png  qdm2  rawvideo  snow
+                     svq3  theora  tscc  mp2 mp3 mp2_float mp3_float
+                     vc1  vp3  vp6  vp6a  vp6f  vp8 vp9 wmapro wmav2  wmv1  wmv2  wmv3 cscd lagarith flac vorbis)
+set(FFMPEG_ENCODERS  ac3  ac3_float dvvideo  ffv1  ffvhuff  flv  h263  huffyuv  mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  snow aac dca flac)
+set(FFMPEG_MUXERS  flv  matroska  mpeg1vcd  mpeg2dvd  mpeg2svcd  mpegts  mov  mp4  psp webm)
+set(FFMPEG_PARSERS  ac3  h263  h264  hevc  mpeg4video)
+set(FFMPEG_PROTOCOLS  file)
+set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc)
+
+#
+#
+#
+#
+MACRO(ADM_FF_SET_DEFAULT)
+    xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-postproc --enable-gpl")
+    xadd("--enable-runtime-cpudetect --disable-network ")
+    xadd("--enable-swscale --disable-swresample")
+    xadd("--disable-doc --disable-programs")
+
+    FIND_HEADER_AND_LIB(_X265 x265.h)
+    FIND_HEADER_AND_LIB(_X265_CONFIG x265_config.h)
+
+    xadd("--disable-libx265")
+    xadd("--disable-libx264")
+    xadd(--prefix ${CMAKE_INSTALL_PREFIX})
+
+    # Clean FFmpeg
+    set_directory_properties(${CMAKE_CURRENT_BINARY_DIR} ADDITIONAL_MAKE_CLEAN_FILES "${FFMPEG_BASE_DIR}")
+
+    # Prepare FFmpeg source
+    include(admFFmpegUtil)
+    include(admFFmpegPrepareTar)
+
+    if (NOT FFMPEG_PREPARED)
+        include(admFFmpegPrepareGit)
+    endif (NOT FFMPEG_PREPARED)
+
+ENDMACRO(ADM_FF_SET_DEFAULT)
+
+
+#
+#
+#
+MACRO(ADM_FF_PATCH_IF_NEEDED)
+    if (FFMPEG_PERFORM_PATCH)
+      # my patches
+        file(GLOB patchFiles "${FFMPEG_PATCH_DIR}/*.patch")
+
+        foreach(patchFile ${patchFiles})
+               get_filename_component(short ${patchFile}  NAME)
+               MESSAGE(STATUS "-- Mine, Applying patch <${short}> --")
+                patch_file("${FFMPEG_SOURCE_DIR}" "${patchFile}")
+        endforeach(patchFile)
+
+      #
+      message("")
+    endif (FFMPEG_PERFORM_PATCH)
+ENDMACRO(ADM_FF_PATCH_IF_NEEDED)
+#
+# There is some weird escaping happing when using mingw+msvc
+# i.e. /D is escaped into d:\mingw\bin or something similiar
+#
+MACRO(ADM_FF_SPLIT flags type)
+     SET(foo "")
+     IF(MSVC)
+                MESSAGE(STATUS "Separating args <${flags}>")
+                SET(sep_flags ${flags})
+                separate_arguments(sep_flags)
+                MESSAGE(STATUS "Separating args <${sep_flags}>")
+                FOREACH(i ${sep_flags})
+                        MESSAGE(STATUS "   ${i}")
+                        string(REGEX REPLACE "^/" "//" flags2 ${i})
+                        string(REGEX REPLACE " /" "//" flags3 ${flags2})
+                        set(foo "${foo} ${flags3}")
+                ENDFOREACH(i ${sep_flags})
+        ELSE(MSVC)
+                set(foo "${flags}")
+        ENDIF(MSVC)
+        xadd(--extra-${type} "${foo}")
+ENDMACRO(ADM_FF_SPLIT flags type)
+
+MACRO(ADM_FF_SET_LD_FLAGS flags)
+                ADM_FF_SPLIT(${flags} "ldflags")
+ENDMACRO(ADM_FF_SET_LD_FLAGS flags)
+MACRO(ADM_FF_SET_C_FLAGS flags)
+                ADM_FF_SPLIT(${flags} "cflags")
+ENDMACRO(ADM_FF_SET_C_FLAGS flags)
+
+#
+#
+#
+MACRO(ADM_FF_ADD_OPTIONS)
+        # Configure FFmpeg, if required
+        foreach (decoder ${FFMPEG_DECODERS})
+            xadd(--enable-decoder ${decoder})
+        endforeach (decoder)
+
+        foreach (encoder ${FFMPEG_ENCODERS})
+            xadd(--enable-encoder ${encoder})
+        endforeach (encoder)
+
+        foreach (muxer ${FFMPEG_MUXERS})
+            xadd(--enable-muxer ${muxer})
+        endforeach (muxer)
+
+        foreach (parser ${FFMPEG_PARSERS})
+            xadd(--enable-parser ${parser})
+        endforeach (parser)
+
+        foreach (protocol ${FFMPEG_PROTOCOLS})
+            xadd(--enable-protocol ${protocol})
+        endforeach (protocol)
+
+        foreach (bistream ${FFMPEG_BSFS})
+            xadd(--enable-bsf ${bistream})
+        endforeach (bistream)
+
+
+        if (NOT ADM_DEBUG)
+            xadd(--disable-debug)
+        endif (NOT ADM_DEBUG)
+ENDMACRO(ADM_FF_ADD_OPTIONS)
+#
+#
+#
+
+MACRO(ADM_FF_INSTALL_LIBS_AND_HEADERS)
+
+    # Add and INSTALL libraries
+    include_directories("${FFMPEG_SOURCE_DIR}")
+    include_directories("${FFMPEG_BINARY_DIR}")
+
+    ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}")
+    ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}")
+    ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}")
+    ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}")
+    ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}")
+
+    INSTALL(FILES "${FFMPEG_BINARY_DIR}/libavutil/avconfig.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev)
+
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/avcodec.h" "${FFMPEG_SOURCE_DIR}/libavcodec/vdpau.h"
+            "${FFMPEG_SOURCE_DIR}/libavcodec/version.h"
+            "${FFMPEG_SOURCE_DIR}/libavcodec/audioconvert.h"
+            DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavformat/avformat.h" "${FFMPEG_SOURCE_DIR}/libavformat/avio.h"
+            "${FFMPEG_SOURCE_DIR}/libavformat/version.h"
+            "${FFMPEG_SOURCE_DIR}/libavformat/flv.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavformat" COMPONENT dev)
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavutil/attributes.h" "${FFMPEG_SOURCE_DIR}/libavutil/avutil.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/buffer.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/bswap.h" "${FFMPEG_SOURCE_DIR}/libavutil/common.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/cpu.h" "${FFMPEG_SOURCE_DIR}/libavutil/frame.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/log.h" "${FFMPEG_SOURCE_DIR}/libavutil/mathematics.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/mem.h" "${FFMPEG_SOURCE_DIR}/libavutil/pixfmt.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/pixdesc.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/channel_layout.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/error.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/dict.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/version.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/time.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/opt.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/intfloat.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/macros.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/samplefmt.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/rational.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev)
+
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/postprocess.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/swscale.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)
+ENDMACRO(ADM_FF_INSTALL_LIBS_AND_HEADERS)
+#
+#
+#
+MACRO(ADM_FF_SET_EXTRA_FLAGS)
+        # nm should be ok if we do not cross compile
+    if(CMAKE_LD_FLAGS)
+                ADM_FF_SET_LD_FLAGS("${CMAKE_LD_FLAGS}")
+    endif(CMAKE_LD_FLAGS)
+    if (CMAKE_C_FLAGS)
+                ADM_FF_SET_C_FLAGS("${CMAKE_C_FLAGS}")
+    endif (CMAKE_C_FLAGS)
+
+    if (CMAKE_SHARED_LINKER_FLAGS)
+                
+            ADM_FF_SET_LD_FLAGS(${CMAKE_SHARED_LINKER_FLAGS})
+    endif (CMAKE_SHARED_LINKER_FLAGS)
+
+    if (VERBOSE)
+            # for ffmpeg to use the same  compiler as others
+            MESSAGE(STATUS "Building ffmpeg with CC=${CMAKE_C_COMPILER}")
+            MESSAGE(STATUS "Building ffmpeg with LD=${CMAKE_C_COMPILER}")
+            MESSAGE(STATUS "Building ffmpeg with AR=${CMAKE_AR}")
+            MESSAGE(STATUS "Building ffmpeg with CMAKE_C_FLAGS=${CMAKE_C_FLAGS}")
+            MESSAGE(STATUS "Building ffmpeg with CFLAGS=${FF_FLAGS}")
+            MESSAGE(STATUS "Building ffmpeg with CFLAGS2=${FFMPEG_FLAGS}")
+            message("")
+        endif (VERBOSE)
+
+    if (FF_FLAGS)
+        set(FF_FLAGS "${FF_FLAGS}" CACHE STRING "")
+        xadd(${FF_FLAGS})
+    endif (FF_FLAGS)
+
+    if (NOT "${LAST_FFMPEG_FLAGS}" STREQUAL "${FFMPEG_FLAGS}")
+        set(FFMPEG_PERFORM_BUILD 1)
+    endif (NOT "${LAST_FFMPEG_FLAGS}" STREQUAL "${FFMPEG_FLAGS}")
+
+    if (NOT EXISTS "${FFMPEG_BINARY_DIR}/Makefile")
+        set(FFMPEG_PERFORM_BUILD 1)
+    endif (NOT EXISTS "${FFMPEG_BINARY_DIR}/Makefile")
+
+ENDMACRO(ADM_FF_SET_EXTRA_FLAGS)
+
+#
+#
+#
+MACRO(ADM_FF_BUILD_UNIX_STYLE)
+
+    find_package(Bourne)
+    find_package(GnuMake)
+
+    message(STATUS "Configuring FFmpeg")
+    set(LAST_FFMPEG_FLAGS "${FFMPEG_FLAGS}" CACHE STRING "" FORCE)
+
+    file(MAKE_DIRECTORY "${FFMPEG_BINARY_DIR}")
+    file(REMOVE "${FFMPEG_BINARY_DIR}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}")
+    file(REMOVE "${FFMPEG_BINARY_DIR}/ffmpeg_g${CMAKE_EXECUTABLE_SUFFIX}")
+
+    set(ffmpeg_bash_directory ${BASH_EXECUTABLE})
+    convertPathToUnix(ffmpeg_bash_directory ${BASH_EXECUTABLE})
+    get_filename_component(ffmpeg_bash_directory ${ffmpeg_bash_directory} PATH)
+    configure_file("${AVIDEMUX_TOP_SOURCE_DIR}/cmake/ffmpeg_configure.sh.cmake" "${FFMPEG_BINARY_DIR}/ffmpeg_configure.sh")
+
+    execute_process(COMMAND ${BASH_EXECUTABLE} ffmpeg_configure.sh WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}"
+                    OUTPUT_VARIABLE FFMPEG_CONFIGURE_OUTPUT RESULT_VARIABLE FFMPEG_CONFIGURE_RESULT)
+
+      if (NOT (FFMPEG_CONFIGURE_RESULT EQUAL 0))
+        MESSAGE(ERROR "configure returned <${FFMPEG_CONFIGURE_RESULT}>")
+        MESSAGE(ERROR "configure output is <${FFMPEG_CONFIGURE_OUTPUT}>")
+        MESSAGE(FATAL_ERROR "An error occured ")
+      endif (NOT (FFMPEG_CONFIGURE_RESULT EQUAL 0))
+
+    MESSAGE(STATUS "Configuring done, processing")
+
+    if (ADM_CPU_X86)
+        file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H)
+        string(REGEX MATCH "#define[ ]+HAVE_YASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
+
+        if (NOT FF_YASM)
+            message(FATAL_ERROR "Yasm was not found.")
+        endif (NOT FF_YASM)
+    endif (ADM_CPU_X86)
+
+    execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "libavutil"
+                    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/config")
+
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "./libavutil/avconfig.h" "${CMAKE_BINARY_DIR}/config/libavutil"
+                    WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
+
+
+
+
+    # Build FFmpeg
+    getFfmpegLibNames("${FFMPEG_SOURCE_DIR}")
+
+    set(ffmpeg_gnumake_executable ${GNUMAKE_EXECUTABLE})
+    convertPathToUnix(ffmpeg_gnumake_executable ${BASH_EXECUTABLE})
+    configure_file("${AVIDEMUX_TOP_SOURCE_DIR}/cmake/ffmpeg_make.sh.cmake" "${FFMPEG_BINARY_DIR}/ffmpeg_make.sh")
+    registerFFmpeg("${FFMPEG_SOURCE_DIR}" "${FFMPEG_BINARY_DIR}" 0)
+    ENDMACRO(ADM_FF_BUILD_UNIX_STYLE)
+#
+#
+#
+MACRO(ADM_FF_ADD_DUMMY_TARGET)
+    if(NOT MSVC)
+       SET(PARRALLEL "-j4") 
+    endif(NOT MSVC)
+    add_custom_target(         libavutil_dummy ALL
+                                       COMMAND ${CMAKE_BUILD_TOOL}  ${PARRALLEL} # We assume make or gnumake when host is unix
+                                       WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}"
+                                       COMMENT "Compiling FFmpeg")
+ENDMACRO(ADM_FF_ADD_DUMMY_TARGET)

avidemux_2.6.16.tar.gz/cmake/admFFmpegBuild_native.cmake Added

@@ -0,0 +1,78 @@
+
+
+include(admFFmpegBuild_helpers)
+
+#@@
+ADM_FF_SET_DEFAULT()
+
+IF(USE_NVENC)
+   SET(FFMPEG_ENCODERS ${FFMPEG_ENCODERS} nvenc)
+   xadd("--enable-nvenc")
+   xadd("--extra-cflags=-I${NVENC_INCLUDE_DIR}")
+   set(FFMPEG_ENCODERS  ${FFMPEG_ENCODERS} nvenc_h264 nvenc_hevc)
+ENDIF(USE_NVENC)
+
+#@@
+ADM_FF_PATCH_IF_NEEDED()
+
+if (FFMPEG_PERFORM_PATCH)
+    MESSAGE(STATUS "Patching Linux common.mak")
+    patch_file("${FFMPEG_SOURCE_DIR}" "${FFMPEG_PATCH_DIR}/common.mak.diff")
+endif (FFMPEG_PERFORM_PATCH)
+
+xadd(--enable-pthreads)
+
+if (USE_VDPAU)
+    xadd(--enable-vdpau)
+    set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_vdpau  vc1_vdpau  mpeg1_vdpau  mpeg_vdpau  wmv3_vdpau)
+endif (USE_VDPAU)
+
+if (USE_LIBVA)
+    xadd(--enable-vaapi)
+    set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_vaapi hevc_vaapi)
+endif (USE_LIBVA)
+
+#@@
+ADM_FF_ADD_OPTIONS()
+
+xadd(--cc "${CMAKE_C_COMPILER}")
+xadd(--ld "${CMAKE_C_COMPILER}")
+xadd(--ar "${CMAKE_AR}")
+
+#@@
+ADM_FF_SET_EXTRA_FLAGS()
+
+#@@
+ADM_FF_BUILD_UNIX_STYLE()
+#
+ADM_FF_ADD_DUMMY_TARGET()
+
+IF(APPLE)
+        MESSAGE(STATUS "Patching config.mak - mac")
+        patch_file("${FFMPEG_BINARY_DIR}" "${FFMPEG_PATCH_DIR}/config.mak.mac.diff")
+ELSE(APPLE)
+        MESSAGE(STATUS "Patching Linux config.mak")
+        patch_file("${FFMPEG_BINARY_DIR}" "${FFMPEG_PATCH_DIR}/config.mak.diff")
+ENDIF(APPLE)
+#
+MACRO(FF_ADD_SUBLIB lib)
+            add_custom_command(
+                   OUTPUT       "${lib}"
+           DEPENDS     libavutil_dummy
+                   COMMAND ${BASH_EXECUTABLE} -c echo "placeHolder")
+
+ENDMACRO(FF_ADD_SUBLIB lib)
+
+FF_ADD_SUBLIB(         "${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"       )
+FF_ADD_SUBLIB(         "${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"       )
+FF_ADD_SUBLIB(      "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"   )
+FF_ADD_SUBLIB(      "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"   )
+FF_ADD_SUBLIB(      "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"     )
+
+ADM_FF_INSTALL_LIBS_AND_HEADERS()
+
+IF(USE_LIBVA)
+                INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/vaapi.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+                INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/vaapi_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+ENDIF(USE_LIBVA)
+# EOF

avidemux_2.6.16.tar.gz/cmake/admFFmpegBuild_vs.cmake Added

@@ -0,0 +1,70 @@
+include(admFFmpegBuild_helpers)
+
+#@@
+ADM_FF_SET_DEFAULT()
+
+IF(USE_NVENC)
+   SET(FFMPEG_ENCODERS ${FFMPEG_ENCODERS} nvenc)
+   xadd("--enable-nonfree")
+   xadd("--enable-nvenc")
+   set(FFMPEG_ENCODERS  ${FFMPEG_ENCODERS} nvenc_h264 nvenc_hevc)
+ENDIF(USE_NVENC)
+
+
+
+#@@
+ADM_FF_PATCH_IF_NEEDED()
+
+
+
+
+#@@
+ADM_FF_ADD_OPTIONS()
+
+
+xadd(--enable-w32threads)
+#
+xadd(--toolchain=msvc)
+
+#  Cross compiler override (win32 & win64)
+xadd(--extra-cflags  -I${VS_ROOT}/include)
+
+message(STATUS "Using VS compilation flag: ${FFMPEG_FLAGS}")
+
+ADM_FF_ADD_OPTIONS()
+
+
+
+ADM_FF_SET_EXTRA_FLAGS()
+
+
+IF(USE_DXVA2)
+      xadd(--enable-dxva2)
+      set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_dxva2 hevc_dxva2)
+ENDIF(USE_DXVA2)
+
+#@@
+ADM_FF_BUILD_UNIX_STYLE()
+
+
+
+add_custom_command(OUTPUT
+                     "${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"
+                     "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"
+                     "${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"
+                     "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"
+                     "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"
+                     "${FFMPEG_BINARY_DIR}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}"
+                     COMMAND ${BASH_EXECUTABLE} ffmpeg_make.sh WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
+
+
+ADM_FF_INSTALL_LIBS_AND_HEADERS()
+
+IF(USE_DXVA2)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+ENDIF(USE_DXVA2)
+
+#
+#
+#

avidemux_2.6.16.tar.gz/cmake/admFFmpegBuild_vs_import.cmake Added

@@ -0,0 +1,96 @@
+##########################################################################################"
+# VS Style management of ffmpeg libs
+# We raw import binaries from somewhere else as they have been compiled with mingw
+#
+# Add -DIMPORT_FOLDER=foobar on cmake
+#
+#
+##########################################################################################"
+IF(NOT IMPORT_FOLDER)
+        SET(IMPORT_FOLDER "d://import//") #Default value
+ENDIF(NOT IMPORT_FOLDER)
+MESSAGE(STATUS "Importing ffmpeg binaries from ${IMPORT_FOLDER}")
+
+SET(LIB_IMPORT_FOLDER "${IMPORT_FOLDER}\\lib")
+INCLUDE_DIRECTORIES(${IMPORT_FOLDER}/include)
+LINK_DIRECTORIES(${IMPORT_FOLDER}/lib)
+set(LIBAVCODEC_LIB ${IMPORT_FOLDER}/lib/avcodec.lib)
+set(LIBAVFORMAT_LIB ${IMPORT_FOLDER}/lib/avformat.lib)
+set(LIBAVUTIL_LIB ${IMPORT_FOLDER}/lib/avutil.lib)
+set(LIBPOSTPROC_LIB ${IMPORT_FOLDER}/lib/postproc.lib)
+set(LIBSWSCALE_LIB ${IMPORT_FOLDER}/lib/swscale.lib)
+
+# Actual lib
+
+add_library(ADM_libswscale UNKNOWN IMPORTED)
+add_library(ADM_libpostproc UNKNOWN IMPORTED)
+add_library(ADM_libavutil UNKNOWN IMPORTED)
+add_library(ADM_libavcodec UNKNOWN IMPORTED)
+add_library(ADM_libavformat UNKNOWN IMPORTED)
+
+
+set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION "${LIBSWSCALE_LIB}")
+set_property(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION "${LIBPOSTPROC_LIB}")
+set_property(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION "${LIBAVUTIL_LIB}")
+set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${LIBAVCODEC_LIB}")
+set_property(TARGET ADM_libavformat PROPERTY IMPORTED_LOCATION "${LIBAVFORMAT_LIB}")
+
+# install .dll.a 
+ADM_INSTALL_LIB_FILES("${LIBAVCODEC_LIB}")
+ADM_INSTALL_LIB_FILES("${LIBAVFORMAT_LIB}")
+ADM_INSTALL_LIB_FILES("${LIBAVUTIL_LIB}")
+ADM_INSTALL_LIB_FILES("${LIBPOSTPROC_LIB}")
+ADM_INSTALL_LIB_FILES("${LIBSWSCALE_LIB}")
+#INSTALL .dll => TODO
+
+# install header
+INSTALL(FILES "${IMPORT_FOLDER}/include/libavutil/avconfig.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev)
+
+INSTALL(FILES "${IMPORT_FOLDER}/include/libavcodec/avcodec.h" "${IMPORT_FOLDER}/include/libavcodec/vdpau.h"
+        "${IMPORT_FOLDER}/include/libavcodec/version.h"
+        "${IMPORT_FOLDER}/include/libavcodec/audioconvert.h"
+        DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+
+INSTALL(FILES "${IMPORT_FOLDER}/include/libavformat/avformat.h" "${IMPORT_FOLDER}/include/libavformat/avio.h"
+        "${IMPORT_FOLDER}/include/libavformat/version.h"
+        "${IMPORT_FOLDER}/include/libavformat/flv.h" 
+        DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavformat" COMPONENT dev)
+
+INSTALL(FILES "${IMPORT_FOLDER}/include/libavutil/attributes.h" 
+        "${IMPORT_FOLDER}/include/libavutil/avutil.h"
+        "${IMPORT_FOLDER}/include/libavutil/buffer.h"
+        "${IMPORT_FOLDER}/include/libavutil/bswap.h" 
+        "${IMPORT_FOLDER}/include/libavutil/common.h"
+        "${IMPORT_FOLDER}/include/libavutil/cpu.h" 
+        "${IMPORT_FOLDER}/include/libavutil/frame.h"
+        "${IMPORT_FOLDER}/include/libavutil/log.h" 
+        "${IMPORT_FOLDER}/include/libavutil/mathematics.h"
+        "${IMPORT_FOLDER}/include/libavutil/mem.h" 
+        "${IMPORT_FOLDER}/include/libavutil/pixfmt.h"
+        "${IMPORT_FOLDER}/include/libavutil/pixdesc.h"
+        "${IMPORT_FOLDER}/include/libavutil/channel_layout.h"
+        "${IMPORT_FOLDER}/include/libavutil/error.h"
+        "${IMPORT_FOLDER}/include/libavutil/dict.h"
+        "${IMPORT_FOLDER}/include/libavutil/version.h"
+        "${IMPORT_FOLDER}/include/libavutil/time.h"
+        "${IMPORT_FOLDER}/include/libavutil/opt.h"
+        "${IMPORT_FOLDER}/include/libavutil/intfloat.h"
+        "${IMPORT_FOLDER}/include/libavutil/macros.h"
+        "${IMPORT_FOLDER}/include/libavutil/samplefmt.h"
+        "${IMPORT_FOLDER}/include/libavutil/rational.h" 
+        DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev)
+
+INSTALL(FILES "${IMPORT_FOLDER}/include/libpostproc/postprocess.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
+INSTALL(FILES "${IMPORT_FOLDER}/include/libpostproc/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
+INSTALL(FILES "${IMPORT_FOLDER}/include/libswscale/swscale.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)
+INSTALL(FILES "${IMPORT_FOLDER}/include/libswscale/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)
+
+
+IF(USE_DXVA2)
+        INSTALL(FILES "${IMPORT_FOLDER}/include/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${IMPORT_FOLDER}/include/libavcodec/dxva2_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+ENDIF(USE_DXVA2)
+
+
+
+# EOF

avidemux_2.6.15.tar.gz/cmake/admFFmpegPrepareGit.cmake -> avidemux_2.6.16.tar.gz/cmake/admFFmpegPrepareGit.cmake Changed

@@ -1,4 +1,5 @@
 find_package(Git)
+find_package(Tar)
 
 if (NOT VERBOSE)
 	set(ffmpegGitOutput OUTPUT_VARIABLE FFMPEG_GIT_OUTPUT)
@@ -8,20 +9,19 @@
 # Checkout FFmpeg source and patch it
 if (NOT EXISTS  "${FFMPEG_SOURCE_DIR}/${FFMPEG_VERSION}")
 	message(STATUS "Checking out FFmpeg from git repository")
-	execute_process(COMMAND ${GIT_EXECUTABLE} clone --depth 20 git://git.videolan.org/ffmpeg.git  "${FFMPEG_SOURCE_DIR}"
+	execute_process(COMMAND ${GIT_EXECUTABLE} clone git://git.videolan.org/ffmpeg.git "${FFMPEG_SOURCE_DIR}"
 					${ffmpegGitOutput})
 	MESSAGE(STATUS "Going to revision ${FFMPEG_VERSION}")
-	execute_process(COMMAND ${GIT_EXECUTABLE} checkout   ${FFMPEG_VERSION}
+	execute_process(COMMAND ${GIT_EXECUTABLE} checkout tags/n${FFMPEG_VERSION} -b ${FFMPEG_VERSION}
 					WORKING_DIRECTORY "${FFMPEG_SOURCE_DIR}"
 					${ffmpegSvnOutput})
 	execute_process(COMMAND touch "${FFMPEG_SOURCE_DIR}/${FFMPEG_VERSION}")
 	MESSAGE(STATUS "Archiving ffmpeg ${FFMPEG_VERSION}")
-	MESSAGE(STATUS "${TAR_EXECUTABLE}  --exclude .git czf ${FFMPEG_ROOT_DIR}/${FFMPEG_SOURCE_ARCHIVE} ffmpeg, DIR=${FFMPEG_BASE_DIR}")
-	execute_process(COMMAND ${TAR_EXECUTABLE} czf  "${FFMPEG_ROOT_DIR}/${FFMPEG_SOURCE_ARCHIVE}" --exclude .git source
+	MESSAGE(STATUS "${TAR_EXECUTABLE} cjf ${FFMPEG_ROOT_DIR}/${FFMPEG_SOURCE_ARCHIVE} --exclude .git source; DIR=${FFMPEG_BASE_DIR}")
+	execute_process(COMMAND ${TAR_EXECUTABLE} cjf "${FFMPEG_ROOT_DIR}/${FFMPEG_SOURCE_ARCHIVE}" --exclude .git source
 				WORKING_DIRECTORY "${FFMPEG_BASE_DIR}"
 				)
 	set(FFMPEG_PERFORM_PATCH 1)
-	set(FFMPEG_PERFORM_PATCH 1)
 endif (NOT EXISTS  "${FFMPEG_SOURCE_DIR}/${FFMPEG_VERSION}")
 
 # Check version

avidemux_2.6.15.tar.gz/cmake/admFFmpegUtil.cmake -> avidemux_2.6.16.tar.gz/cmake/admFFmpegUtil.cmake Changed

avidemux_2.6.15.tar.gz/cmake/admMainChecks.cmake -> avidemux_2.6.16.tar.gz/cmake/admMainChecks.cmake Changed

@@ -33,6 +33,24 @@
 	include(_GenerateExportHeader)
 endif (${CMAKE_VERSION} VERSION_GREATER 2.8.5)
 
+IF(WIN32)
+	IF(NOT CROSS)
+		# Add the rootfs
+                IF(NOT VS_ROOT)
+		        SET(VS_ROOT "d:/mingw")
+                ENDIF(NOT VS_ROOT)
+                MESSAGE(STATUS "VS:using ${VS_ROOT} to import libs and headers")
+                INCLUDE_DIRECTORIES(${VS_ROOT}/include)
+                LINK_DIRECTORIES(${VS_ROOT}/lib)
+                LINK_DIRECTORIES(${VS_ROOT}/bin)
+                # Add prefix and suffix so that libraries xxx.dll.a can be found
+                SET(CMAKE_FIND_LIBRARY_PREFIXES lib )
+                SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll.a .a )
+	ENDIF(NOT CROSS)
+ENDIF(WIN32)
+
+
+
 INCLUDE(admConfigHelper)
 include(admGetRevision)
 
@@ -145,17 +163,10 @@
 IF(NOT PLUGINS)
 INCLUDE(admCheckMiscLibs)
 INCLUDE(FindThreads)
-INCLUDE(admCheckVDPAU)
-IF(WIN32)
-INCLUDE(admCheckDxva2)
-ENDIF(WIN32)
 
 INCLUDE(admCheckNvEnc)
 #INCLUDE(admCheckXvba)
-INCLUDE(admCheckLibVA)
-checkVDPAU()
 #checkXvba()
-checkLibVA()
 checkNvEnc()
 ENDIF(NOT PLUGINS)

avidemux_2.6.15.tar.gz/cmake/admWindRes.cmake -> avidemux_2.6.16.tar.gz/cmake/admWindRes.cmake Changed

avidemux_2.6.15.tar.gz/cmake/ae_plugin.cmake -> avidemux_2.6.16.tar.gz/cmake/ae_plugin.cmake Changed

avidemux_2.6.15.tar.gz/cmake/av_plugin.cmake -> avidemux_2.6.16.tar.gz/cmake/av_plugin.cmake Changed

avidemux_2.6.15.tar.gz/cmake/avidemuxVersion.cmake -> avidemux_2.6.16.tar.gz/cmake/avidemuxVersion.cmake Changed

avidemux_2.6.15.tar.gz/cmake/commonCmakeApplication.cmake -> avidemux_2.6.16.tar.gz/cmake/commonCmakeApplication.cmake Changed

avidemux_2.6.15.tar.gz/cmake/dm_plugin.cmake -> avidemux_2.6.16.tar.gz/cmake/dm_plugin.cmake Changed

avidemux_2.6.15.tar.gz/cmake/mx_plugin.cmake -> avidemux_2.6.16.tar.gz/cmake/mx_plugin.cmake Changed

avidemux_2.6.15.tar.gz/cmake/osx/Avidemux2.6 -> avidemux_2.6.16.tar.gz/cmake/osx/Avidemux2.6 Changed

avidemux_2.6.16.tar.gz/cmake/osx/fonts.conf Added

@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+
+<fontconfig>
+
+
+
+
+
+	<dir>/usr/share/fonts</dir>
+	<dir>/usr/X11/lib/X11/fonts</dir> <dir>/opt/local/share/fonts</dir> <dir>/Library/Fonts</dir> <dir>/Network/Library/Fonts</dir> <dir>/System/Library/Fonts</dir>
+	<dir prefix="xdg">fonts</dir>
+	
+	<dir>~/.fonts</dir>
+
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>mono</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>monospace</string>
+		</edit>
+	</match>
+
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans serif</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+
+	<include ignore_missing="yes">conf.d</include>
+
+
+
+	<cachedir>/opt/local/var/cache/fontconfig</cachedir>
+	<cachedir prefix="xdg">fontconfig</cachedir>
+	
+	<cachedir>~/.fontconfig</cachedir>
+
+	<config>
+
+		<rescan>
+			<int>30</int>
+		</rescan>
+	</config>
+
+</fontconfig>

avidemux_2.6.15.tar.gz/cmake/ve_plugin.cmake -> avidemux_2.6.16.tar.gz/cmake/ve_plugin.cmake Changed

avidemux_2.6.15.tar.gz/cmake/ve_plugin_qt4.cmake -> avidemux_2.6.16.tar.gz/cmake/ve_plugin_qt4.cmake Changed

avidemux_2.6.15.tar.gz/cmake/vf_plugin.cmake -> avidemux_2.6.16.tar.gz/cmake/vf_plugin.cmake Changed

avidemux_2.6.15.tar.gz/createDebFromSourceUbuntu.bash -> avidemux_2.6.16.tar.gz/createDebFromSourceUbuntu.bash Changed

@@ -1,14 +1,111 @@
 #!/bin/bash
-echo "This will install all the necessary packages and build avidemux, it will take 20 mn or so"
-echo "Please enter your password"
-sudo apt-get install gcc g++ make cmake pkg-config libpng12-dev fakeroot yasm libsqlite3-dev  build-essential  qttools5-dev-tools qtbase5-dev libaften-dev libmp3lame-dev libx264-dev  libfaad-dev libfaac-dev libvdpau-dev libx265-dev libopus-dev libvorbis-dev libogg-dev libfribidi-dev  \
-libfontconfig1-dev  \
-libxv-dev \
-libpulse-dev \
-libdca-dev
-# 
-echo "Compiling avidemux"
-bash bootStrap.bash --deb
-echo "Installing avidemux..."
-cd debs && sudo dpkg -i *
-
+install_packages=1
+default_install_prefix="/usr"
+install_prefix="$default_install_prefix"
+rebuild=""
+#
+usage()
+{
+    echo "Usage: $0 [Options]"
+    echo "***********************"
+    echo "  --help or -h      : Print usage"
+    echo "  --deps-only       : Just install build dependencies and exit"
+    echo "  --prefix=DIR      : Install to directory DIR (default: $default_install_prefix)"
+    echo "  --no-install      : Don't install generated debian avidemux packages"
+    echo "  --rebuild         : Preserve existing build directories"
+}
+#
+install_deps()
+{
+    echo "This will install all the packages necessary to build avidemux"
+    echo "You will be asked to enter your password because installing build dependencies requires root permissions"
+    # gcc, g++ and make get installed as dependencies of build-essential
+    sudo apt-get update && sudo apt-get install build-essential cmake pkg-config yasm \
+    libsqlite3-dev libfontconfig1-dev libfribidi-dev libxv-dev libvdpau-dev libva-dev libpulse-dev \
+    qttools5-dev-tools qtbase5-dev libqt5opengl5-dev \
+    libpng12-dev libaften-dev libmp3lame-dev libx264-dev libfaad-dev libfaac-dev libopus-dev libvorbis-dev libogg-dev libdca-dev \
+    || { echo "The installation at least of some of the build dependencies failed. Aborting." && exit 2; }
+    sudo apt-get install libx265-dev \
+    || echo "Warning: libx265-dev cannot be installed using package management. Avidemux won't be able to encode in h265 unless the library and the headers have been installed manually. Continuing anyway." # there are no official libx265 packages for Ubuntu Trusty
+}
+#
+install_avidemux()
+{
+    echo "Installing avidemux..."
+    cd debs && sudo dpkg -i *
+}
+#
+option_value()
+{
+    echo $(echo $* | cut -d '=' -f 2-)
+}
+#
+option_name()
+{
+    echo $(echo $* | cut -d '=' -f 1 | cut -b 3-)
+}
+#
+dir_check()
+{
+    op_name="$1"
+    dir_path="$2"
+    if [ "x$dir_path" != "x" ]; then
+        if [[ "$dir_path" != /* ]]; then
+            >&2 echo "Expected an absolute path for --$op_name=$dir_path, aborting."
+            exit 1
+        fi
+    else
+        >&2 echo "Empty path provided for --$op_name, aborting."
+        exit 1
+    fi
+    case "$dir_path" in
+      */)
+          echo $(expr "x$dir_path" : 'x$.*[^/]$') # strip trailing slashes
+          ;;
+      *)
+          echo "$dir_path"
+          ;;
+    esac
+}
+#
+while [ $# != 0 ]; do
+    config_option="$1"
+    case "$config_option" in
+        -h|--help)
+            usage
+            exit 0
+            ;;
+        --deps-only)
+            install_deps
+            exit 0
+            ;;
+        --prefix=*)
+            install_prefix=$(dir_check $(option_name "$config_option") $(option_value "$config_option")) || exit 1
+            ;;
+        --no-install)
+            install_packages=0
+            ;;
+        --rebuild)
+            rebuild="$config_option"
+            ;;
+        *)
+            echo "unknown parameter $config_option"
+            usage
+            exit 1
+            ;;
+    esac
+    shift
+done
+#
+install_deps
+#
+echo "Compiling avidemux, it will take 20 minutes or so"
+bash bootStrap.bash --deb --prefix=$install_prefix $rebuild 2>&1 | tee log-bootstrap-$(date +%F_%T).log \
+ || { echo "Build failed. Cancelling installation." && exit 3; }
+#
+if [ $install_packages -eq 1 ]; then
+    install_avidemux
+    exit
+fi
+#
+exit 0

avidemux_2.6.16.tar.gz/cross-compiling.txt Added

@@ -0,0 +1,129 @@
+******************************************************************************
+***            Cross-compiling Avidemux on Linux for Windows               ***
+***                                                                        ***
+***          Description of the default build environment setup            ***
+******************************************************************************
+
+
+1. Install MXE (M cross environment) dependencies as described in
+
+    http://mxe.cc/#requirements
+
+for your respective Linux distribution then clone the git repository as
+described in
+
+    http://mxe.cc/#download
+
+to /opt:
+
+    cd /opt
+    git clone https://github.com/mxe/mxe.git
+
+(make /opt temporarily writable by the user or clone as root / using sudo).
+Change the owner and the group of /opt/mxe to those of the user. In the
+exemplary setup the 'mxe' folder has been subsequently moved elsewhere and
+then bind-mounted to /opt/mxe to save write cycles of an SSD where /opt
+resides. This has been done purely for convenience and is not required.
+
+
+2. Create /opt/mxe/settings.mk with
+
+MXE_TARGETS :=  i686-w64-mingw32.shared x86_64-w64-mingw32.shared
+
+as content to build both 32 bit and 64 bit environments. Optionally, you can
+set the variable MXE_TMP which determines where intermediate files are created
+(e.g. to /tmp) by adding
+
+MXE_TMP := /tmp
+
+to the settings.mk file.
+
+
+3. Build required MXE packages for the targets specified above with
+
+    cd /opt/mxe
+    make qtwinextras sdl2 ogg vorbis lame a52dec faad2 fdk-aac libmad opus fribidi libass xvidcore x264
+
+This pulls in all the dependencies and can take a couple of hours. The final
+total size of the /opt/mxe folder may be about 2.2G. Please note that twolame
+is not available as a shared library and x265 has not been packaged for MXE as
+of this writing.
+
+
+4. Download x265_2.1.tar.gz from
+
+    https://bitbucket.org/multicoreware/x265/downloads
+
+extract the content of the tarball, enter the 'x265_2.1/build' directory,
+create a new subdirectory, e.g. 'mingw-w32', enter this subdirectory, create
+a 'build.cmake' file there with
+
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(CMAKE_C_COMPILER i686-w64-mingw32.shared-gcc)
+SET(CMAKE_CXX_COMPILER i686-w64-mingw32.shared-g++)
+SET(CMAKE_RC_COMPILER i686-w64-mingw32.shared-windres)
+SET(CMAKE_ASM_YASM_COMPILER yasm)
+
+as content, ensure that /opt/mxe/usr/bin is in $PATH and run
+
+    cmake -DCMAKE_TOOLCHAIN_FILE=build.cmake -DCMAKE_INSTALL_PREFIX=/opt/mxe/usr/i686-w64-mingw32.shared -DENABLE_CLI=OFF ../../source
+    make -j $(nproc)
+    make install
+
+(the last command has to be run as root or using sudo if the directory
+'/opt/mxe/usr/i686-w64-mingw32.shared' is not writable by the user).
+
+To build and install 64 bit x265, create e.g. 'mingw-w64' as a subdirectory of
+'x265_2.1/build', enter this subdirectory, create a 'build.cmake' file there
+with
+
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(CMAKE_C_COMPILER x86_64-w64-mingw32.shared-gcc)
+SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32.shared-g++)
+SET(CMAKE_RC_COMPILER x86_64-w64-mingw32.shared-windres)
+SET(CMAKE_ASM_YASM_COMPILER yasm)
+
+as content, again ensure that /opt/mxe/usr/bin is in $PATH  and run
+
+    cmake -DCMAKE_TOOLCHAIN_FILE=build.cmake -DCMAKE_INSTALL_PREFIX=/opt/mxe/usr/x86_64-w64-mingw32.shared -DENABLE_CLI=OFF ../../source
+    make -j $(nproc)
+    make install
+
+(the last command has to be run as root or using sudo if the directory
+'/opt/mxe/usr/x86_64-w64-mingw32.shared' is not writable by the user).
+
+Please note that you need yasm >= 1.3 to build a 64 bit x265 library, this
+requirement is not met on Debian 8.
+
+
+5. Create a user-writable directory 'out' in '/opt/mxe/usr/x86_64-w64-mingw32.shared'
+and in '/opt/mxe/usr/i686-w64-mingw32.shared' respectively.
+
+
+6. Enter the Avidemux top source directory and run
+
+    bash bootStrapCrossMingwQt5_mxe.sh
+
+to cross-compile a 32 bit Avidemux version or
+
+    bash bootStrapCrossMingwQt5_mxe.sh --64
+
+to cross-compile a 64 bit version. Run
+
+    bash bootStrapCrossMingwQt5_mxe.sh -h
+
+to see the list of all available options. It is assumed that 'zip' utility is
+installed and in $PATH. Copy the 'avidemux_rYYMMDD-hhmmss_win{32,64}Qt5.zip'
+file from the 'packaged_mingw_build_YYMMDD-hhmmss' directory to a Windows
+partition, extract it on Windows and run 'avidemux.exe' from there.
+
+
+7. Issues:
+
+The build of the subtitle plugin and subsequently of the entire Avidemux
+package fails as of this writing unless the '--with-system-libass' option is
+added.
+
+As of this writing, twolame, aften, vapoursynth and avsproxy are not available.
+
+2016-12-13 UTC 09:02

avidemux_2.6.16.tar.gz/foreignBuilds/msvc/include/GL Added

avidemux_2.6.16.tar.gz/foreignBuilds/msvc/include/GL/glext.h Added

@@ -0,0 +1,12146 @@
+#ifndef __glext_h_
+#define __glext_h_ 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2013-2016 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+/*
+** This header is generated from the Khronos OpenGL / OpenGL ES XML
+** API Registry. The current version of the Registry, generator scripts
+** used to make the header, and the header can be found at
+**   http://www.opengl.org/registry/
+**
+** Khronos $Revision: 33248 $ on $Date: 2016-10-24 01:22:03 -0400 (Mon, 24 Oct 2016) $
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+#define GL_GLEXT_VERSION 20161024
+
+/* Generated C header for:
+ * API: gl
+ * Profile: compatibility
+ * Versions considered: .*
+ * Versions emitted: 1\.[2-9]|[234]\.[0-9]
+ * Default extensions included: gl
+ * Additional extensions included: _nomatch_^
+ * Extensions removed: _nomatch_^
+ */
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
+#define GL_SINGLE_COLOR                   0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_VERSION_1_2 */
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
+#define GL_MAX_TEXTURE_UNITS              0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
+#define GL_MULTISAMPLE_BIT                0x20000000
+#define GL_NORMAL_MAP                     0x8511
+#define GL_REFLECTION_MAP                 0x8512
+#define GL_COMPRESSED_ALPHA               0x84E9
+#define GL_COMPRESSED_LUMINANCE           0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
+#define GL_COMPRESSED_INTENSITY           0x84EC
+#define GL_COMBINE                        0x8570
+#define GL_COMBINE_RGB                    0x8571
+#define GL_COMBINE_ALPHA                  0x8572
+#define GL_SOURCE0_RGB                    0x8580
+#define GL_SOURCE1_RGB                    0x8581
+#define GL_SOURCE2_RGB                    0x8582
+#define GL_SOURCE0_ALPHA                  0x8588
+#define GL_SOURCE1_ALPHA                  0x8589
+#define GL_SOURCE2_ALPHA                  0x858A
+#define GL_OPERAND0_RGB                   0x8590
+#define GL_OPERAND1_RGB                   0x8591
+#define GL_OPERAND2_RGB                   0x8592
+#define GL_OPERAND0_ALPHA                 0x8598
+#define GL_OPERAND1_ALPHA                 0x8599
+#define GL_OPERAND2_ALPHA                 0x859A
+#define GL_RGB_SCALE                      0x8573
+#define GL_ADD_SIGNED                     0x8574
+#define GL_INTERPOLATE                    0x8575
+#define GL_SUBTRACT                       0x84E7
+#define GL_CONSTANT                       0x8576
+#define GL_PRIMARY_COLOR                  0x8577
+#define GL_PREVIOUS                       0x8578
+#define GL_DOT3_RGB                       0x86AE
+#define GL_DOT3_RGBA                      0x86AF
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLfloat value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, void *img);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum texture);
+GLAPI void APIENTRY glSampleCoverage (GLfloat value, GLboolean invert);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, void *img);
+GLAPI void APIENTRY glClientActiveTexture (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1i (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m);
+#endif
+#endif /* GL_VERSION_1_3 */
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#define GL_POINT_SIZE_MIN                 0x8126
+#define GL_POINT_SIZE_MAX                 0x8127
+#define GL_POINT_DISTANCE_ATTENUATION     0x8129
+#define GL_GENERATE_MIPMAP                0x8191
+#define GL_GENERATE_MIPMAP_HINT           0x8192
+#define GL_FOG_COORDINATE_SOURCE          0x8450
+#define GL_FOG_COORDINATE                 0x8451
+#define GL_FRAGMENT_DEPTH                 0x8452
+#define GL_CURRENT_FOG_COORDINATE         0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
+#define GL_FOG_COORDINATE_ARRAY           0x8457
+#define GL_COLOR_SUM                      0x8458
+#define GL_CURRENT_SECONDARY_COLOR        0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
+#define GL_SECONDARY_COLOR_ARRAY          0x845E
+#define GL_TEXTURE_FILTER_CONTROL         0x8500
+#define GL_DEPTH_TEXTURE_MODE             0x884B
+#define GL_COMPARE_R_TO_TEXTURE           0x884E
+#define GL_FUNC_ADD                       0x8006
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
+GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
+GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFogCoordf (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoordd (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddv (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3iv (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glWindowPos2d (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2f (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2i (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos2s (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2sv (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
+GLAPI void APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GLAPI void APIENTRY glBlendEquation (GLenum mode);
+#endif
+#endif /* GL_VERSION_1_4 */
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+#include <stddef.h>
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#define GL_SRC1_ALPHA                     0x8589
+#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
+#define GL_FOG_COORD_SRC                  0x8450
+#define GL_FOG_COORD                      0x8451
+#define GL_CURRENT_FOG_COORD              0x8453
+#define GL_FOG_COORD_ARRAY_TYPE           0x8454
+#define GL_FOG_COORD_ARRAY_STRIDE         0x8455
+#define GL_FOG_COORD_ARRAY_POINTER        0x8456
+#define GL_FOG_COORD_ARRAY                0x8457
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D
+#define GL_SRC0_RGB                       0x8580
+#define GL_SRC1_RGB                       0x8581
+#define GL_SRC2_RGB                       0x8582
+#define GL_SRC0_ALPHA                     0x8588
+#define GL_SRC2_ALPHA                     0x858A
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, void *data);
+typedef void *(APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint id);
+GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQuery (GLenum target);
+GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer);
+GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, void *data);
+GLAPI void *APIENTRY glMapBuffer (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_VERSION_1_5 */
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+typedef char GLchar;
+#define GL_BLEND_EQUATION_RGB             0x8009
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#define GL_DRAW_BUFFER0                   0x8825
+#define GL_DRAW_BUFFER1                   0x8826
+#define GL_DRAW_BUFFER2                   0x8827
+#define GL_DRAW_BUFFER3                   0x8828
+#define GL_DRAW_BUFFER4                   0x8829
+#define GL_DRAW_BUFFER5                   0x882A
+#define GL_DRAW_BUFFER6                   0x882B
+#define GL_DRAW_BUFFER7                   0x882C
+#define GL_DRAW_BUFFER8                   0x882D
+#define GL_DRAW_BUFFER9                   0x882E
+#define GL_DRAW_BUFFER10                  0x882F
+#define GL_DRAW_BUFFER11                  0x8830
+#define GL_DRAW_BUFFER12                  0x8831
+#define GL_DRAW_BUFFER13                  0x8832
+#define GL_DRAW_BUFFER14                  0x8833
+#define GL_DRAW_BUFFER15                  0x8834
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
+#define GL_MAX_VARYING_FLOATS             0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_1D                     0x8B5D
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_3D                     0x8B5F
+#define GL_SAMPLER_CUBE                   0x8B60
+#define GL_SAMPLER_1D_SHADOW              0x8B61
+#define GL_SAMPLER_2D_SHADOW              0x8B62
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
+#define GL_LOWER_LEFT                     0x8CA1
+#define GL_UPPER_LEFT                     0x8CA2
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
+#define GL_POINT_SPRITE                   0x8861
+#define GL_COORD_REPLACE                  0x8862
+#define GL_MAX_TEXTURE_COORDS             0x8871
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, void **pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
+typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
+GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
+GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
+GLAPI void APIENTRY glCompileShader (GLuint shader);
+GLAPI GLuint APIENTRY glCreateProgram (void);
+GLAPI GLuint APIENTRY glCreateShader (GLenum type);
+GLAPI void APIENTRY glDeleteProgram (GLuint program);
+GLAPI void APIENTRY glDeleteShader (GLuint shader);
+GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
+GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, void **pointer);
+GLAPI GLboolean APIENTRY glIsProgram (GLuint program);
+GLAPI GLboolean APIENTRY glIsShader (GLuint shader);
+GLAPI void APIENTRY glLinkProgram (GLuint program);
+GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
+GLAPI void APIENTRY glUseProgram (GLuint program);
+GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1i (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glValidateProgram (GLuint program);
+GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_VERSION_2_0 */
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
+#define GL_FLOAT_MAT2x3                   0x8B65
+#define GL_FLOAT_MAT2x4                   0x8B66
+#define GL_FLOAT_MAT3x2                   0x8B67
+#define GL_FLOAT_MAT3x4                   0x8B68
+#define GL_FLOAT_MAT4x2                   0x8B69
+#define GL_FLOAT_MAT4x3                   0x8B6A
+#define GL_SRGB                           0x8C40
+#define GL_SRGB8                          0x8C41
+#define GL_SRGB_ALPHA                     0x8C42
+#define GL_SRGB8_ALPHA8                   0x8C43
+#define GL_COMPRESSED_SRGB                0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_SLUMINANCE_ALPHA               0x8C44
+#define GL_SLUMINANCE8_ALPHA8             0x8C45
+#define GL_SLUMINANCE                     0x8C46
+#define GL_SLUMINANCE8                    0x8C47
+#define GL_COMPRESSED_SLUMINANCE          0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
+#endif /* GL_VERSION_2_1 */
+
+#ifndef GL_VERSION_3_0
+#define GL_VERSION_3_0 1
+typedef unsigned short GLhalf;
+#define GL_COMPARE_REF_TO_TEXTURE         0x884E
+#define GL_CLIP_DISTANCE0                 0x3000
+#define GL_CLIP_DISTANCE1                 0x3001
+#define GL_CLIP_DISTANCE2                 0x3002
+#define GL_CLIP_DISTANCE3                 0x3003
+#define GL_CLIP_DISTANCE4                 0x3004
+#define GL_CLIP_DISTANCE5                 0x3005
+#define GL_CLIP_DISTANCE6                 0x3006
+#define GL_CLIP_DISTANCE7                 0x3007
+#define GL_MAX_CLIP_DISTANCES             0x0D32
+#define GL_MAJOR_VERSION                  0x821B
+#define GL_MINOR_VERSION                  0x821C
+#define GL_NUM_EXTENSIONS                 0x821D
+#define GL_CONTEXT_FLAGS                  0x821E
+#define GL_COMPRESSED_RED                 0x8225
+#define GL_COMPRESSED_RG                  0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x00000001
+#define GL_RGBA32F                        0x8814
+#define GL_RGB32F                         0x8815
+#define GL_RGBA16F                        0x881A
+#define GL_RGB16F                         0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
+#define GL_CLAMP_READ_COLOR               0x891C
+#define GL_FIXED_ONLY                     0x891D
+#define GL_MAX_VARYING_COMPONENTS         0x8B4B
+#define GL_TEXTURE_1D_ARRAY               0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
+#define GL_TEXTURE_2D_ARRAY               0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
+#define GL_R11F_G11F_B10F                 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
+#define GL_RGB9_E5                        0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
+#define GL_TEXTURE_SHARED_SIZE            0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED           0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD             0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS            0x8C8C
+#define GL_SEPARATE_ATTRIBS               0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI                       0x8D70
+#define GL_RGB32UI                        0x8D71
+#define GL_RGBA16UI                       0x8D76
+#define GL_RGB16UI                        0x8D77
+#define GL_RGBA8UI                        0x8D7C
+#define GL_RGB8UI                         0x8D7D
+#define GL_RGBA32I                        0x8D82
+#define GL_RGB32I                         0x8D83
+#define GL_RGBA16I                        0x8D88
+#define GL_RGB16I                         0x8D89
+#define GL_RGBA8I                         0x8D8E
+#define GL_RGB8I                          0x8D8F
+#define GL_RED_INTEGER                    0x8D94
+#define GL_GREEN_INTEGER                  0x8D95
+#define GL_BLUE_INTEGER                   0x8D96
+#define GL_RGB_INTEGER                    0x8D98
+#define GL_RGBA_INTEGER                   0x8D99
+#define GL_BGR_INTEGER                    0x8D9A
+#define GL_BGRA_INTEGER                   0x8D9B
+#define GL_SAMPLER_1D_ARRAY               0x8DC0
+#define GL_SAMPLER_2D_ARRAY               0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
+#define GL_UNSIGNED_INT_VEC2              0x8DC6
+#define GL_UNSIGNED_INT_VEC3              0x8DC7
+#define GL_UNSIGNED_INT_VEC4              0x8DC8
+#define GL_INT_SAMPLER_1D                 0x8DC9
+#define GL_INT_SAMPLER_2D                 0x8DCA
+#define GL_INT_SAMPLER_3D                 0x8DCB
+#define GL_INT_SAMPLER_CUBE               0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
+#define GL_QUERY_WAIT                     0x8E13
+#define GL_QUERY_NO_WAIT                  0x8E14
+#define GL_QUERY_BY_REGION_WAIT           0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
+#define GL_BUFFER_ACCESS_FLAGS            0x911F
+#define GL_BUFFER_MAP_LENGTH              0x9120
+#define GL_BUFFER_MAP_OFFSET              0x9121
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#define GL_DEPTH32F_STENCIL8              0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
+#define GL_FRAMEBUFFER_DEFAULT            0x8218
+#define GL_FRAMEBUFFER_UNDEFINED          0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
+#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
+#define GL_DEPTH_STENCIL                  0x84F9
+#define GL_UNSIGNED_INT_24_8              0x84FA
+#define GL_DEPTH24_STENCIL8               0x88F0
+#define GL_TEXTURE_STENCIL_SIZE           0x88F1
+#define GL_TEXTURE_RED_TYPE               0x8C10
+#define GL_TEXTURE_GREEN_TYPE             0x8C11
+#define GL_TEXTURE_BLUE_TYPE              0x8C12
+#define GL_TEXTURE_ALPHA_TYPE             0x8C13
+#define GL_TEXTURE_DEPTH_TYPE             0x8C16
+#define GL_UNSIGNED_NORMALIZED            0x8C17
+#define GL_FRAMEBUFFER_BINDING            0x8CA6
+#define GL_DRAW_FRAMEBUFFER_BINDING       0x8CA6
+#define GL_RENDERBUFFER_BINDING           0x8CA7
+#define GL_READ_FRAMEBUFFER               0x8CA8
+#define GL_DRAW_FRAMEBUFFER               0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
+#define GL_RENDERBUFFER_SAMPLES           0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
+#define GL_COLOR_ATTACHMENT0              0x8CE0
+#define GL_COLOR_ATTACHMENT1              0x8CE1
+#define GL_COLOR_ATTACHMENT2              0x8CE2
+#define GL_COLOR_ATTACHMENT3              0x8CE3
+#define GL_COLOR_ATTACHMENT4              0x8CE4
+#define GL_COLOR_ATTACHMENT5              0x8CE5
+#define GL_COLOR_ATTACHMENT6              0x8CE6
+#define GL_COLOR_ATTACHMENT7              0x8CE7
+#define GL_COLOR_ATTACHMENT8              0x8CE8
+#define GL_COLOR_ATTACHMENT9              0x8CE9
+#define GL_COLOR_ATTACHMENT10             0x8CEA
+#define GL_COLOR_ATTACHMENT11             0x8CEB
+#define GL_COLOR_ATTACHMENT12             0x8CEC
+#define GL_COLOR_ATTACHMENT13             0x8CED
+#define GL_COLOR_ATTACHMENT14             0x8CEE
+#define GL_COLOR_ATTACHMENT15             0x8CEF
+#define GL_COLOR_ATTACHMENT16             0x8CF0
+#define GL_COLOR_ATTACHMENT17             0x8CF1
+#define GL_COLOR_ATTACHMENT18             0x8CF2
+#define GL_COLOR_ATTACHMENT19             0x8CF3
+#define GL_COLOR_ATTACHMENT20             0x8CF4
+#define GL_COLOR_ATTACHMENT21             0x8CF5
+#define GL_COLOR_ATTACHMENT22             0x8CF6
+#define GL_COLOR_ATTACHMENT23             0x8CF7
+#define GL_COLOR_ATTACHMENT24             0x8CF8
+#define GL_COLOR_ATTACHMENT25             0x8CF9
+#define GL_COLOR_ATTACHMENT26             0x8CFA
+#define GL_COLOR_ATTACHMENT27             0x8CFB
+#define GL_COLOR_ATTACHMENT28             0x8CFC
+#define GL_COLOR_ATTACHMENT29             0x8CFD
+#define GL_COLOR_ATTACHMENT30             0x8CFE
+#define GL_COLOR_ATTACHMENT31             0x8CFF
+#define GL_DEPTH_ATTACHMENT               0x8D00
+#define GL_STENCIL_ATTACHMENT             0x8D20
+#define GL_FRAMEBUFFER                    0x8D40
+#define GL_RENDERBUFFER                   0x8D41
+#define GL_RENDERBUFFER_WIDTH             0x8D42
+#define GL_RENDERBUFFER_HEIGHT            0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
+#define GL_STENCIL_INDEX1                 0x8D46
+#define GL_STENCIL_INDEX4                 0x8D47
+#define GL_STENCIL_INDEX8                 0x8D48
+#define GL_STENCIL_INDEX16                0x8D49
+#define GL_RENDERBUFFER_RED_SIZE          0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
+#define GL_MAX_SAMPLES                    0x8D57
+#define GL_INDEX                          0x8222
+#define GL_TEXTURE_LUMINANCE_TYPE         0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE         0x8C15
+#define GL_FRAMEBUFFER_SRGB               0x8DB9
+#define GL_HALF_FLOAT                     0x140B
+#define GL_MAP_READ_BIT                   0x0001
+#define GL_MAP_WRITE_BIT                  0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
+#define GL_COMPRESSED_RED_RGTC1           0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
+#define GL_COMPRESSED_RG_RGTC2            0x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
+#define GL_RG                             0x8227
+#define GL_RG_INTEGER                     0x8228
+#define GL_R8                             0x8229
+#define GL_R16                            0x822A
+#define GL_RG8                            0x822B
+#define GL_RG16                           0x822C
+#define GL_R16F                           0x822D
+#define GL_R32F                           0x822E
+#define GL_RG16F                          0x822F
+#define GL_RG32F                          0x8230
+#define GL_R8I                            0x8231
+#define GL_R8UI                           0x8232
+#define GL_R16I                           0x8233
+#define GL_R16UI                          0x8234
+#define GL_R32I                           0x8235
+#define GL_R32UI                          0x8236
+#define GL_RG8I                           0x8237
+#define GL_RG8UI                          0x8238
+#define GL_RG16I                          0x8239
+#define GL_RG16UI                         0x823A
+#define GL_RG32I                          0x823B
+#define GL_RG32UI                         0x823C
+#define GL_VERTEX_ARRAY_BINDING           0x85B5
+#define GL_CLAMP_VERTEX_COLOR             0x891A
+#define GL_CLAMP_FRAGMENT_COLOR           0x891B
+#define GL_ALPHA_INTEGER                  0x8D97
+typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef const GLubyte *(APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void *(APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glEnablei (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisablei (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index);
+GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedback (void);
+GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp);
+GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRender (void);
+GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value);
+GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value);
+GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GLAPI const GLubyte *APIENTRY glGetStringi (GLenum name, GLuint index);
+GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmap (GLenum target);
+GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void *APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glBindVertexArray (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array);
+#endif
+#endif /* GL_VERSION_3_0 */
+
+#ifndef GL_VERSION_3_1
+#define GL_VERSION_3_1 1
+#define GL_SAMPLER_2D_RECT                0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
+#define GL_SAMPLER_BUFFER                 0x8DC2
+#define GL_INT_SAMPLER_2D_RECT            0x8DCD
+#define GL_INT_SAMPLER_BUFFER             0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
+#define GL_TEXTURE_BUFFER                 0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
+#define GL_TEXTURE_RECTANGLE              0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
+#define GL_R8_SNORM                       0x8F94
+#define GL_RG8_SNORM                      0x8F95
+#define GL_RGB8_SNORM                     0x8F96
+#define GL_RGBA8_SNORM                    0x8F97
+#define GL_R16_SNORM                      0x8F98
+#define GL_RG16_SNORM                     0x8F99
+#define GL_RGB16_SNORM                    0x8F9A
+#define GL_RGBA16_SNORM                   0x8F9B
+#define GL_SIGNED_NORMALIZED              0x8F9C
+#define GL_PRIMITIVE_RESTART              0x8F9D
+#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
+#define GL_COPY_READ_BUFFER               0x8F36
+#define GL_COPY_WRITE_BUFFER              0x8F37
+#define GL_UNIFORM_BUFFER                 0x8A11
+#define GL_UNIFORM_BUFFER_BINDING         0x8A28
+#define GL_UNIFORM_BUFFER_START           0x8A29
+#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
+#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
+#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
+#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
+#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
+#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
+#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
+#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
+#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
+#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
+#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
+#define GL_UNIFORM_TYPE                   0x8A37
+#define GL_UNIFORM_SIZE                   0x8A38
+#define GL_UNIFORM_NAME_LENGTH            0x8A39
+#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
+#define GL_UNIFORM_OFFSET                 0x8A3B
+#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
+#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
+#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
+#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
+#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
+#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
+#define GL_INVALID_INDEX                  0xFFFFFFFFu
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
+GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
+GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index);
+GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
+GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName);
+GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#endif
+#endif /* GL_VERSION_3_1 */
+
+#ifndef GL_VERSION_3_2
+#define GL_VERSION_3_2 1
+typedef struct __GLsync *GLsync;
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glxext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GL_EXT_timer_query extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__) || defined(__digital__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__) || defined(_LP64)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS ) || defined(__sgi)
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+/* Fallback if nothing above works */
+#include <inttypes.h>
+#endif
+#endif
+typedef uint64_t GLuint64;
+typedef int64_t GLint64;
+#define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
+#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
+#define GL_LINES_ADJACENCY                0x000A
+#define GL_LINE_STRIP_ADJACENCY           0x000B
+#define GL_TRIANGLES_ADJACENCY            0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY       0x000D
+#define GL_PROGRAM_POINT_SIZE             0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
+#define GL_GEOMETRY_SHADER                0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT          0x8916
+#define GL_GEOMETRY_INPUT_TYPE            0x8917
+#define GL_GEOMETRY_OUTPUT_TYPE           0x8918
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES   0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
+#define GL_MAX_VERTEX_OUTPUT_COMPONENTS   0x9122
+#define GL_MAX_GEOMETRY_INPUT_COMPONENTS  0x9123
+#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
+#define GL_MAX_FRAGMENT_INPUT_COMPONENTS  0x9125
+#define GL_CONTEXT_PROFILE_MASK           0x9126
+#define GL_DEPTH_CLAMP                    0x864F
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION        0x8E4D
+#define GL_LAST_VERTEX_CONVENTION         0x8E4E
+#define GL_PROVOKING_VERTEX               0x8E4F
+#define GL_TEXTURE_CUBE_MAP_SEAMLESS      0x884F
+#define GL_MAX_SERVER_WAIT_TIMEOUT        0x9111
+#define GL_OBJECT_TYPE                    0x9112
+#define GL_SYNC_CONDITION                 0x9113
+#define GL_SYNC_STATUS                    0x9114
+#define GL_SYNC_FLAGS                     0x9115
+#define GL_SYNC_FENCE                     0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
+#define GL_UNSIGNALED                     0x9118
+#define GL_SIGNALED                       0x9119
+#define GL_ALREADY_SIGNALED               0x911A
+#define GL_TIMEOUT_EXPIRED                0x911B
+#define GL_CONDITION_SATISFIED            0x911C
+#define GL_WAIT_FAILED                    0x911D
+#define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
+#define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
+#define GL_SAMPLE_POSITION                0x8E50
+#define GL_SAMPLE_MASK                    0x8E51
+#define GL_SAMPLE_MASK_VALUE              0x8E52
+#define GL_MAX_SAMPLE_MASK_WORDS          0x8E59
+#define GL_TEXTURE_2D_MULTISAMPLE         0x9100
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE   0x9101
+#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY   0x9102
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
+#define GL_TEXTURE_SAMPLES                0x9106
+#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
+#define GL_SAMPLER_2D_MULTISAMPLE         0x9108
+#define GL_INT_SAMPLER_2D_MULTISAMPLE     0x9109
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
+#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910B
+#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
+#define GL_MAX_COLOR_TEXTURE_SAMPLES      0x910E
+#define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
+#define GL_MAX_INTEGER_SAMPLES            0x9110
+typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex);
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
+typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
+typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync);
+typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync);
+typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *data);
+typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint maskNumber, GLbitfield mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
+GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex);
+GLAPI void APIENTRY glProvokingVertex (GLenum mode);
+GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags);
+GLAPI GLboolean APIENTRY glIsSync (GLsync sync);
+GLAPI void APIENTRY glDeleteSync (GLsync sync);
+GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *data);
+GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data);
+GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaski (GLuint maskNumber, GLbitfield mask);
+#endif
+#endif /* GL_VERSION_3_2 */
+
+#ifndef GL_VERSION_3_3
+#define GL_VERSION_3_3 1
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR    0x88FE
+#define GL_SRC1_COLOR                     0x88F9
+#define GL_ONE_MINUS_SRC1_COLOR           0x88FA
+#define GL_ONE_MINUS_SRC1_ALPHA           0x88FB
+#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS   0x88FC
+#define GL_ANY_SAMPLES_PASSED             0x8C2F
+#define GL_SAMPLER_BINDING                0x8919
+#define GL_RGB10_A2UI                     0x906F
+#define GL_TEXTURE_SWIZZLE_R              0x8E42
+#define GL_TEXTURE_SWIZZLE_G              0x8E43
+#define GL_TEXTURE_SWIZZLE_B              0x8E44
+#define GL_TEXTURE_SWIZZLE_A              0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA           0x8E46
+#define GL_TIME_ELAPSED                   0x88BF
+#define GL_TIMESTAMP                      0x8E28
+#define GL_INT_2_10_10_10_REV             0x8D9F
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
+typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
+typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler);
+typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers);
+GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers);
+GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler);
+GLAPI void APIENTRY glBindSampler (GLuint unit, GLuint sampler);
+GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param);
+GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param);
+GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetSamplerParameterIuiv (GLuint sampler, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target);
+GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params);
+GLAPI void APIENTRY glVertexAttribDivisor (GLuint index, GLuint divisor);
+GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color);
+#endif
+#endif /* GL_VERSION_3_3 */
+
+#ifndef GL_VERSION_4_0
+#define GL_VERSION_4_0 1
+#define GL_SAMPLE_SHADING                 0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE       0x8C37
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F
+#define GL_TEXTURE_CUBE_MAP_ARRAY         0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY   0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY         0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW  0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY     0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
+#define GL_DRAW_INDIRECT_BUFFER           0x8F3F
+#define GL_DRAW_INDIRECT_BUFFER_BINDING   0x8F43
+#define GL_GEOMETRY_SHADER_INVOCATIONS    0x887F
+#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
+#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
+#define GL_MAX_VERTEX_STREAMS             0x8E71
+#define GL_DOUBLE_VEC2                    0x8FFC
+#define GL_DOUBLE_VEC3                    0x8FFD
+#define GL_DOUBLE_VEC4                    0x8FFE
+#define GL_DOUBLE_MAT2                    0x8F46
+#define GL_DOUBLE_MAT3                    0x8F47
+#define GL_DOUBLE_MAT4                    0x8F48
+#define GL_DOUBLE_MAT2x3                  0x8F49
+#define GL_DOUBLE_MAT2x4                  0x8F4A
+#define GL_DOUBLE_MAT3x2                  0x8F4B
+#define GL_DOUBLE_MAT3x4                  0x8F4C
+#define GL_DOUBLE_MAT4x2                  0x8F4D
+#define GL_DOUBLE_MAT4x3                  0x8F4E
+#define GL_ACTIVE_SUBROUTINES             0x8DE5
+#define GL_ACTIVE_SUBROUTINE_UNIFORMS     0x8DE6
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
+#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH   0x8E48
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
+#define GL_MAX_SUBROUTINES                0x8DE7
+#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
+#define GL_NUM_COMPATIBLE_SUBROUTINES     0x8E4A
+#define GL_COMPATIBLE_SUBROUTINES         0x8E4B
+#define GL_PATCHES                        0x000E
+#define GL_PATCH_VERTICES                 0x8E72
+#define GL_PATCH_DEFAULT_INNER_LEVEL      0x8E73
+#define GL_PATCH_DEFAULT_OUTER_LEVEL      0x8E74
+#define GL_TESS_CONTROL_OUTPUT_VERTICES   0x8E75
+#define GL_TESS_GEN_MODE                  0x8E76
+#define GL_TESS_GEN_SPACING               0x8E77
+#define GL_TESS_GEN_VERTEX_ORDER          0x8E78
+#define GL_TESS_GEN_POINT_MODE            0x8E79
+#define GL_ISOLINES                       0x8E7A
+#define GL_FRACTIONAL_ODD                 0x8E7B
+#define GL_FRACTIONAL_EVEN                0x8E7C
+#define GL_MAX_PATCH_VERTICES             0x8E7D
+#define GL_MAX_TESS_GEN_LEVEL             0x8E7E
+#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
+#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
+#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
+#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
+#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
+#define GL_MAX_TESS_PATCH_COMPONENTS      0x8E84
+#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
+#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
+#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
+#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
+#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
+#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
+#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
+#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
+#define GL_TESS_EVALUATION_SHADER         0x8E87
+#define GL_TESS_CONTROL_SHADER            0x8E88
+#define GL_TRANSFORM_FEEDBACK             0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING     0x8E25
+#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLfloat value);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect);
+typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params);
+typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices);
+typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values);
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
+typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShading (GLfloat value);
+GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const void *indirect);
+GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const void *indirect);
+GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x);
+GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params);
+GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices);
+GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params);
+GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value);
+GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values);
+GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedback (void);
+GLAPI void APIENTRY glResumeTransformFeedback (void);
+GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id);
+GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream);
+GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id);
+GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index);
+GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params);
+#endif
+#endif /* GL_VERSION_4_0 */
+
+#ifndef GL_VERSION_4_1
+#define GL_VERSION_4_1 1
+#define GL_FIXED                          0x140C
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
+#define GL_LOW_FLOAT                      0x8DF0
+#define GL_MEDIUM_FLOAT                   0x8DF1
+#define GL_HIGH_FLOAT                     0x8DF2
+#define GL_LOW_INT                        0x8DF3
+#define GL_MEDIUM_INT                     0x8DF4
+#define GL_HIGH_INT                       0x8DF5
+#define GL_SHADER_COMPILER                0x8DFA
+#define GL_SHADER_BINARY_FORMATS          0x8DF8
+#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
+#define GL_MAX_VERTEX_UNIFORM_VECTORS     0x8DFB
+#define GL_MAX_VARYING_VECTORS            0x8DFC
+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS   0x8DFD
+#define GL_RGB565                         0x8D62
+#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257
+#define GL_PROGRAM_BINARY_LENGTH          0x8741
+#define GL_NUM_PROGRAM_BINARY_FORMATS     0x87FE
+#define GL_PROGRAM_BINARY_FORMATS         0x87FF
+#define GL_VERTEX_SHADER_BIT              0x00000001
+#define GL_FRAGMENT_SHADER_BIT            0x00000002
+#define GL_GEOMETRY_SHADER_BIT            0x00000004
+#define GL_TESS_CONTROL_SHADER_BIT        0x00000008
+#define GL_TESS_EVALUATION_SHADER_BIT     0x00000010
+#define GL_ALL_SHADER_BITS                0xFFFFFFFF
+#define GL_PROGRAM_SEPARABLE              0x8258
+#define GL_ACTIVE_PROGRAM                 0x8259
+#define GL_PROGRAM_PIPELINE_BINDING       0x825A
+#define GL_MAX_VIEWPORTS                  0x825B
+#define GL_VIEWPORT_SUBPIXEL_BITS         0x825C
+#define GL_VIEWPORT_BOUNDS_RANGE          0x825D
+#define GL_LAYER_PROVOKING_VERTEX         0x825E
+#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F
+#define GL_UNDEFINED_VERTEX               0x8260
+typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void);
+typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
+typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
+typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLfloat n, GLfloat f);
+typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLfloat d);
+typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
+typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
+typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar *const*strings);
+typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint *pipelines);
+typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint *v);
+typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLdouble n, GLdouble f);
+typedef void (APIENTRYP PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReleaseShaderCompiler (void);
+GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
+GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
+GLAPI void APIENTRY glDepthRangef (GLfloat n, GLfloat f);
+GLAPI void APIENTRY glClearDepthf (GLfloat d);
+GLAPI void APIENTRY glGetProgramBinary (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
+GLAPI void APIENTRY glProgramBinary (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
+GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glUseProgramStages (GLuint pipeline, GLbitfield stages, GLuint program);
+GLAPI void APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program);
+GLAPI GLuint APIENTRY glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar *const*strings);
+GLAPI void APIENTRY glBindProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glDeleteProgramPipelines (GLsizei n, const GLuint *pipelines);
+GLAPI void APIENTRY glGenProgramPipelines (GLsizei n, GLuint *pipelines);
+GLAPI GLboolean APIENTRY glIsProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glGetProgramPipelineiv (GLuint pipeline, GLenum pname, GLint *params);
+GLAPI void APIENTRY glProgramUniform1i (GLuint program, GLint location, GLint v0);
+GLAPI void APIENTRY glProgramUniform1iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform1f (GLuint program, GLint location, GLfloat v0);
+GLAPI void APIENTRY glProgramUniform1fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1d (GLuint program, GLint location, GLdouble v0);
+GLAPI void APIENTRY glProgramUniform1dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform1ui (GLuint program, GLint location, GLuint v0);
+GLAPI void APIENTRY glProgramUniform1uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform2i (GLuint program, GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glProgramUniform2iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform2f (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glProgramUniform2fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform2d (GLuint program, GLint location, GLdouble v0, GLdouble v1);
+GLAPI void APIENTRY glProgramUniform2dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2ui (GLuint program, GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glProgramUniform2uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform3i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glProgramUniform3iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform3f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glProgramUniform3fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform3d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+GLAPI void APIENTRY glProgramUniform3dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glProgramUniform3uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform4i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glProgramUniform4iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform4f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glProgramUniform4fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform4d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+GLAPI void APIENTRY glProgramUniform4dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glProgramUniform4uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniformMatrix2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glValidateProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glGetProgramPipelineInfoLog (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glVertexAttribL1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttribL2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttribL3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttribL4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttribL1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribLPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribLdv (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glViewportArrayv (GLuint first, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glViewportIndexedf (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+GLAPI void APIENTRY glViewportIndexedfv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glScissorArrayv (GLuint first, GLsizei count, const GLint *v);
+GLAPI void APIENTRY glScissorIndexed (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glScissorIndexedv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glDepthRangeIndexed (GLuint index, GLdouble n, GLdouble f);
+GLAPI void APIENTRY glGetFloati_v (GLenum target, GLuint index, GLfloat *data);
+GLAPI void APIENTRY glGetDoublei_v (GLenum target, GLuint index, GLdouble *data);
+#endif
+#endif /* GL_VERSION_4_1 */
+
+#ifndef GL_VERSION_4_2
+#define GL_VERSION_4_2 1
+#define GL_COPY_READ_BUFFER_BINDING       0x8F36
+#define GL_COPY_WRITE_BUFFER_BINDING      0x8F37
+#define GL_TRANSFORM_FEEDBACK_ACTIVE      0x8E24
+#define GL_TRANSFORM_FEEDBACK_PAUSED      0x8E23
+#define GL_UNPACK_COMPRESSED_BLOCK_WIDTH  0x9127
+#define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128
+#define GL_UNPACK_COMPRESSED_BLOCK_DEPTH  0x9129
+#define GL_UNPACK_COMPRESSED_BLOCK_SIZE   0x912A
+#define GL_PACK_COMPRESSED_BLOCK_WIDTH    0x912B
+#define GL_PACK_COMPRESSED_BLOCK_HEIGHT   0x912C
+#define GL_PACK_COMPRESSED_BLOCK_DEPTH    0x912D
+#define GL_PACK_COMPRESSED_BLOCK_SIZE     0x912E
+#define GL_NUM_SAMPLE_COUNTS              0x9380
+#define GL_MIN_MAP_BUFFER_ALIGNMENT       0x90BC
+#define GL_ATOMIC_COUNTER_BUFFER          0x92C0
+#define GL_ATOMIC_COUNTER_BUFFER_BINDING  0x92C1
+#define GL_ATOMIC_COUNTER_BUFFER_START    0x92C2
+#define GL_ATOMIC_COUNTER_BUFFER_SIZE     0x92C3
+#define GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE 0x92C4
+#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS 0x92C5
+#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES 0x92C6
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER 0x92C7
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER 0x92C8
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER 0x92C9
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER 0x92CA
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER 0x92CB
+#define GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS 0x92CC
+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS 0x92CD
+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS 0x92CE
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS 0x92CF
+#define GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS 0x92D0
+#define GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS 0x92D1
+#define GL_MAX_VERTEX_ATOMIC_COUNTERS     0x92D2
+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS 0x92D3
+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS 0x92D4
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS   0x92D5
+#define GL_MAX_FRAGMENT_ATOMIC_COUNTERS   0x92D6
+#define GL_MAX_COMBINED_ATOMIC_COUNTERS   0x92D7
+#define GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE 0x92D8
+#define GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS 0x92DC
+#define GL_ACTIVE_ATOMIC_COUNTER_BUFFERS  0x92D9
+#define GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX 0x92DA
+#define GL_UNSIGNED_INT_ATOMIC_COUNTER    0x92DB
+#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001
+#define GL_ELEMENT_ARRAY_BARRIER_BIT      0x00000002
+#define GL_UNIFORM_BARRIER_BIT            0x00000004
+#define GL_TEXTURE_FETCH_BARRIER_BIT      0x00000008
+#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020
+#define GL_COMMAND_BARRIER_BIT            0x00000040
+#define GL_PIXEL_BUFFER_BARRIER_BIT       0x00000080
+#define GL_TEXTURE_UPDATE_BARRIER_BIT     0x00000100
+#define GL_BUFFER_UPDATE_BARRIER_BIT      0x00000200
+#define GL_FRAMEBUFFER_BARRIER_BIT        0x00000400
+#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x00000800
+#define GL_ATOMIC_COUNTER_BARRIER_BIT     0x00001000
+#define GL_ALL_BARRIER_BITS               0xFFFFFFFF
+#define GL_MAX_IMAGE_UNITS                0x8F38
+#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39
+#define GL_IMAGE_BINDING_NAME             0x8F3A
+#define GL_IMAGE_BINDING_LEVEL            0x8F3B
+#define GL_IMAGE_BINDING_LAYERED          0x8F3C
+#define GL_IMAGE_BINDING_LAYER            0x8F3D
+#define GL_IMAGE_BINDING_ACCESS           0x8F3E
+#define GL_IMAGE_1D                       0x904C
+#define GL_IMAGE_2D                       0x904D
+#define GL_IMAGE_3D                       0x904E
+#define GL_IMAGE_2D_RECT                  0x904F
+#define GL_IMAGE_CUBE                     0x9050
+#define GL_IMAGE_BUFFER                   0x9051
+#define GL_IMAGE_1D_ARRAY                 0x9052
+#define GL_IMAGE_2D_ARRAY                 0x9053
+#define GL_IMAGE_CUBE_MAP_ARRAY           0x9054
+#define GL_IMAGE_2D_MULTISAMPLE           0x9055
+#define GL_IMAGE_2D_MULTISAMPLE_ARRAY     0x9056
+#define GL_INT_IMAGE_1D                   0x9057
+#define GL_INT_IMAGE_2D                   0x9058
+#define GL_INT_IMAGE_3D                   0x9059
+#define GL_INT_IMAGE_2D_RECT              0x905A
+#define GL_INT_IMAGE_CUBE                 0x905B
+#define GL_INT_IMAGE_BUFFER               0x905C
+#define GL_INT_IMAGE_1D_ARRAY             0x905D
+#define GL_INT_IMAGE_2D_ARRAY             0x905E
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY       0x905F
+#define GL_INT_IMAGE_2D_MULTISAMPLE       0x9060
+#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x9061
+#define GL_UNSIGNED_INT_IMAGE_1D          0x9062
+#define GL_UNSIGNED_INT_IMAGE_2D          0x9063
+#define GL_UNSIGNED_INT_IMAGE_3D          0x9064
+#define GL_UNSIGNED_INT_IMAGE_2D_RECT     0x9065
+#define GL_UNSIGNED_INT_IMAGE_CUBE        0x9066
+#define GL_UNSIGNED_INT_IMAGE_BUFFER      0x9067
+#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY    0x9068
+#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY    0x9069
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY 0x906A
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE 0x906B
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x906C
+#define GL_MAX_IMAGE_SAMPLES              0x906D
+#define GL_IMAGE_BINDING_FORMAT           0x906E
+#define GL_IMAGE_FORMAT_COMPATIBILITY_TYPE 0x90C7
+#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE 0x90C8
+#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS 0x90C9
+#define GL_MAX_VERTEX_IMAGE_UNIFORMS      0x90CA
+#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS 0x90CB
+#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS 0x90CC
+#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS    0x90CD
+#define GL_MAX_FRAGMENT_IMAGE_UNIFORMS    0x90CE
+#define GL_MAX_COMBINED_IMAGE_UNIFORMS    0x90CF
+#define GL_COMPRESSED_RGBA_BPTC_UNORM     0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F
+#define GL_TEXTURE_IMMUTABLE_FORMAT       0x912F
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC) (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREPROC) (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
+typedef void (APIENTRYP PFNGLMEMORYBARRIERPROC) (GLbitfield barriers);
+typedef void (APIENTRYP PFNGLTEXSTORAGE1DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC) (GLenum mode, GLuint id, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC) (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedBaseInstance (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
+GLAPI void APIENTRY glDrawElementsInstancedBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertexBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
+GLAPI void APIENTRY glGetInternalformativ (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
+GLAPI void APIENTRY glGetActiveAtomicCounterBufferiv (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params);
+GLAPI void APIENTRY glBindImageTexture (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
+GLAPI void APIENTRY glMemoryBarrier (GLbitfield barriers);
+GLAPI void APIENTRY glTexStorage1D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTexStorage2D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTexStorage3D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glDrawTransformFeedbackInstanced (GLenum mode, GLuint id, GLsizei instancecount);
+GLAPI void APIENTRY glDrawTransformFeedbackStreamInstanced (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
+#endif
+#endif /* GL_VERSION_4_2 */
+
+#ifndef GL_VERSION_4_3
+#define GL_VERSION_4_3 1
+typedef void (APIENTRY  *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+#define GL_NUM_SHADING_LANGUAGE_VERSIONS  0x82E9
+#define GL_VERTEX_ATTRIB_ARRAY_LONG       0x874E
+#define GL_COMPRESSED_RGB8_ETC2           0x9274
+#define GL_COMPRESSED_SRGB8_ETC2          0x9275
+#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276
+#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277
+#define GL_COMPRESSED_RGBA8_ETC2_EAC      0x9278
+#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279
+#define GL_COMPRESSED_R11_EAC             0x9270
+#define GL_COMPRESSED_SIGNED_R11_EAC      0x9271
+#define GL_COMPRESSED_RG11_EAC            0x9272
+#define GL_COMPRESSED_SIGNED_RG11_EAC     0x9273
+#define GL_PRIMITIVE_RESTART_FIXED_INDEX  0x8D69
+#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A
+#define GL_MAX_ELEMENT_INDEX              0x8D6B
+#define GL_COMPUTE_SHADER                 0x91B9
+#define GL_MAX_COMPUTE_UNIFORM_BLOCKS     0x91BB
+#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC
+#define GL_MAX_COMPUTE_IMAGE_UNIFORMS     0x91BD
+#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262
+#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263
+#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264
+#define GL_MAX_COMPUTE_ATOMIC_COUNTERS    0x8265
+#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266
+#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB
+#define GL_MAX_COMPUTE_WORK_GROUP_COUNT   0x91BE
+#define GL_MAX_COMPUTE_WORK_GROUP_SIZE    0x91BF
+#define GL_COMPUTE_WORK_GROUP_SIZE        0x8267
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED
+#define GL_DISPATCH_INDIRECT_BUFFER       0x90EE
+#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF
+#define GL_COMPUTE_SHADER_BIT             0x00000020
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS       0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION        0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM      0x8245
+#define GL_DEBUG_SOURCE_API               0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM     0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER   0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY       0x8249
+#define GL_DEBUG_SOURCE_APPLICATION       0x824A
+#define GL_DEBUG_SOURCE_OTHER             0x824B
+#define GL_DEBUG_TYPE_ERROR               0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR  0x824E
+#define GL_DEBUG_TYPE_PORTABILITY         0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE         0x8250
+#define GL_DEBUG_TYPE_OTHER               0x8251
+#define GL_MAX_DEBUG_MESSAGE_LENGTH       0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES      0x9144
+#define GL_DEBUG_LOGGED_MESSAGES          0x9145
+#define GL_DEBUG_SEVERITY_HIGH            0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM          0x9147
+#define GL_DEBUG_SEVERITY_LOW             0x9148
+#define GL_DEBUG_TYPE_MARKER              0x8268
+#define GL_DEBUG_TYPE_PUSH_GROUP          0x8269
+#define GL_DEBUG_TYPE_POP_GROUP           0x826A
+#define GL_DEBUG_SEVERITY_NOTIFICATION    0x826B
+#define GL_MAX_DEBUG_GROUP_STACK_DEPTH    0x826C
+#define GL_DEBUG_GROUP_STACK_DEPTH        0x826D
+#define GL_BUFFER                         0x82E0
+#define GL_SHADER                         0x82E1
+#define GL_PROGRAM                        0x82E2
+#define GL_QUERY                          0x82E3
+#define GL_PROGRAM_PIPELINE               0x82E4
+#define GL_SAMPLER                        0x82E6
+#define GL_MAX_LABEL_LENGTH               0x82E8
+#define GL_DEBUG_OUTPUT                   0x92E0
+#define GL_CONTEXT_FLAG_DEBUG_BIT         0x00000002
+#define GL_MAX_UNIFORM_LOCATIONS          0x826E
+#define GL_FRAMEBUFFER_DEFAULT_WIDTH      0x9310
+#define GL_FRAMEBUFFER_DEFAULT_HEIGHT     0x9311
+#define GL_FRAMEBUFFER_DEFAULT_LAYERS     0x9312
+#define GL_FRAMEBUFFER_DEFAULT_SAMPLES    0x9313
+#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314
+#define GL_MAX_FRAMEBUFFER_WIDTH          0x9315
+#define GL_MAX_FRAMEBUFFER_HEIGHT         0x9316
+#define GL_MAX_FRAMEBUFFER_LAYERS         0x9317
+#define GL_MAX_FRAMEBUFFER_SAMPLES        0x9318
+#define GL_INTERNALFORMAT_SUPPORTED       0x826F
+#define GL_INTERNALFORMAT_PREFERRED       0x8270
+#define GL_INTERNALFORMAT_RED_SIZE        0x8271
+#define GL_INTERNALFORMAT_GREEN_SIZE      0x8272
+#define GL_INTERNALFORMAT_BLUE_SIZE       0x8273
+#define GL_INTERNALFORMAT_ALPHA_SIZE      0x8274
+#define GL_INTERNALFORMAT_DEPTH_SIZE      0x8275
+#define GL_INTERNALFORMAT_STENCIL_SIZE    0x8276
+#define GL_INTERNALFORMAT_SHARED_SIZE     0x8277
+#define GL_INTERNALFORMAT_RED_TYPE        0x8278
+#define GL_INTERNALFORMAT_GREEN_TYPE      0x8279
+#define GL_INTERNALFORMAT_BLUE_TYPE       0x827A
+#define GL_INTERNALFORMAT_ALPHA_TYPE      0x827B
+#define GL_INTERNALFORMAT_DEPTH_TYPE      0x827C
+#define GL_INTERNALFORMAT_STENCIL_TYPE    0x827D
+#define GL_MAX_WIDTH                      0x827E
+#define GL_MAX_HEIGHT                     0x827F
+#define GL_MAX_DEPTH                      0x8280
+#define GL_MAX_LAYERS                     0x8281
+#define GL_MAX_COMBINED_DIMENSIONS        0x8282
+#define GL_COLOR_COMPONENTS               0x8283
+#define GL_DEPTH_COMPONENTS               0x8284
+#define GL_STENCIL_COMPONENTS             0x8285
+#define GL_COLOR_RENDERABLE               0x8286
+#define GL_DEPTH_RENDERABLE               0x8287
+#define GL_STENCIL_RENDERABLE             0x8288
+#define GL_FRAMEBUFFER_RENDERABLE         0x8289
+#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A
+#define GL_FRAMEBUFFER_BLEND              0x828B
+#define GL_READ_PIXELS                    0x828C
+#define GL_READ_PIXELS_FORMAT             0x828D
+#define GL_READ_PIXELS_TYPE               0x828E
+#define GL_TEXTURE_IMAGE_FORMAT           0x828F
+#define GL_TEXTURE_IMAGE_TYPE             0x8290
+#define GL_GET_TEXTURE_IMAGE_FORMAT       0x8291
+#define GL_GET_TEXTURE_IMAGE_TYPE         0x8292
+#define GL_MIPMAP                         0x8293
+#define GL_MANUAL_GENERATE_MIPMAP         0x8294
+#define GL_AUTO_GENERATE_MIPMAP           0x8295
+#define GL_COLOR_ENCODING                 0x8296
+#define GL_SRGB_READ                      0x8297
+#define GL_SRGB_WRITE                     0x8298
+#define GL_FILTER                         0x829A
+#define GL_VERTEX_TEXTURE                 0x829B
+#define GL_TESS_CONTROL_TEXTURE           0x829C
+#define GL_TESS_EVALUATION_TEXTURE        0x829D
+#define GL_GEOMETRY_TEXTURE               0x829E
+#define GL_FRAGMENT_TEXTURE               0x829F
+#define GL_COMPUTE_TEXTURE                0x82A0
+#define GL_TEXTURE_SHADOW                 0x82A1
+#define GL_TEXTURE_GATHER                 0x82A2
+#define GL_TEXTURE_GATHER_SHADOW          0x82A3
+#define GL_SHADER_IMAGE_LOAD              0x82A4
+#define GL_SHADER_IMAGE_STORE             0x82A5
+#define GL_SHADER_IMAGE_ATOMIC            0x82A6
+#define GL_IMAGE_TEXEL_SIZE               0x82A7
+#define GL_IMAGE_COMPATIBILITY_CLASS      0x82A8
+#define GL_IMAGE_PIXEL_FORMAT             0x82A9
+#define GL_IMAGE_PIXEL_TYPE               0x82AA
+#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC
+#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD
+#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE
+#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF
+#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1
+#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2
+#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE  0x82B3
+#define GL_CLEAR_BUFFER                   0x82B4
+#define GL_TEXTURE_VIEW                   0x82B5
+#define GL_VIEW_COMPATIBILITY_CLASS       0x82B6
+#define GL_FULL_SUPPORT                   0x82B7
+#define GL_CAVEAT_SUPPORT                 0x82B8
+#define GL_IMAGE_CLASS_4_X_32             0x82B9
+#define GL_IMAGE_CLASS_2_X_32             0x82BA
+#define GL_IMAGE_CLASS_1_X_32             0x82BB
+#define GL_IMAGE_CLASS_4_X_16             0x82BC
+#define GL_IMAGE_CLASS_2_X_16             0x82BD
+#define GL_IMAGE_CLASS_1_X_16             0x82BE
+#define GL_IMAGE_CLASS_4_X_8              0x82BF
+#define GL_IMAGE_CLASS_2_X_8              0x82C0
+#define GL_IMAGE_CLASS_1_X_8              0x82C1
+#define GL_IMAGE_CLASS_11_11_10           0x82C2
+#define GL_IMAGE_CLASS_10_10_10_2         0x82C3
+#define GL_VIEW_CLASS_128_BITS            0x82C4
+#define GL_VIEW_CLASS_96_BITS             0x82C5
+#define GL_VIEW_CLASS_64_BITS             0x82C6
+#define GL_VIEW_CLASS_48_BITS             0x82C7
+#define GL_VIEW_CLASS_32_BITS             0x82C8
+#define GL_VIEW_CLASS_24_BITS             0x82C9
+#define GL_VIEW_CLASS_16_BITS             0x82CA
+#define GL_VIEW_CLASS_8_BITS              0x82CB
+#define GL_VIEW_CLASS_S3TC_DXT1_RGB       0x82CC
+#define GL_VIEW_CLASS_S3TC_DXT1_RGBA      0x82CD
+#define GL_VIEW_CLASS_S3TC_DXT3_RGBA      0x82CE
+#define GL_VIEW_CLASS_S3TC_DXT5_RGBA      0x82CF
+#define GL_VIEW_CLASS_RGTC1_RED           0x82D0
+#define GL_VIEW_CLASS_RGTC2_RG            0x82D1
+#define GL_VIEW_CLASS_BPTC_UNORM          0x82D2
+#define GL_VIEW_CLASS_BPTC_FLOAT          0x82D3
+#define GL_UNIFORM                        0x92E1
+#define GL_UNIFORM_BLOCK                  0x92E2
+#define GL_PROGRAM_INPUT                  0x92E3
+#define GL_PROGRAM_OUTPUT                 0x92E4
+#define GL_BUFFER_VARIABLE                0x92E5
+#define GL_SHADER_STORAGE_BLOCK           0x92E6
+#define GL_VERTEX_SUBROUTINE              0x92E8
+#define GL_TESS_CONTROL_SUBROUTINE        0x92E9
+#define GL_TESS_EVALUATION_SUBROUTINE     0x92EA
+#define GL_GEOMETRY_SUBROUTINE            0x92EB
+#define GL_FRAGMENT_SUBROUTINE            0x92EC
+#define GL_COMPUTE_SUBROUTINE             0x92ED
+#define GL_VERTEX_SUBROUTINE_UNIFORM      0x92EE
+#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF
+#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0
+#define GL_GEOMETRY_SUBROUTINE_UNIFORM    0x92F1
+#define GL_FRAGMENT_SUBROUTINE_UNIFORM    0x92F2
+#define GL_COMPUTE_SUBROUTINE_UNIFORM     0x92F3
+#define GL_TRANSFORM_FEEDBACK_VARYING     0x92F4
+#define GL_ACTIVE_RESOURCES               0x92F5
+#define GL_MAX_NAME_LENGTH                0x92F6
+#define GL_MAX_NUM_ACTIVE_VARIABLES       0x92F7
+#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8
+#define GL_NAME_LENGTH                    0x92F9
+#define GL_TYPE                           0x92FA
+#define GL_ARRAY_SIZE                     0x92FB
+#define GL_OFFSET                         0x92FC
+#define GL_BLOCK_INDEX                    0x92FD
+#define GL_ARRAY_STRIDE                   0x92FE
+#define GL_MATRIX_STRIDE                  0x92FF
+#define GL_IS_ROW_MAJOR                   0x9300
+#define GL_ATOMIC_COUNTER_BUFFER_INDEX    0x9301
+#define GL_BUFFER_BINDING                 0x9302
+#define GL_BUFFER_DATA_SIZE               0x9303
+#define GL_NUM_ACTIVE_VARIABLES           0x9304
+#define GL_ACTIVE_VARIABLES               0x9305
+#define GL_REFERENCED_BY_VERTEX_SHADER    0x9306
+#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307
+#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308
+#define GL_REFERENCED_BY_GEOMETRY_SHADER  0x9309
+#define GL_REFERENCED_BY_FRAGMENT_SHADER  0x930A
+#define GL_REFERENCED_BY_COMPUTE_SHADER   0x930B
+#define GL_TOP_LEVEL_ARRAY_SIZE           0x930C
+#define GL_TOP_LEVEL_ARRAY_STRIDE         0x930D
+#define GL_LOCATION                       0x930E
+#define GL_LOCATION_INDEX                 0x930F
+#define GL_IS_PER_PATCH                   0x92E7
+#define GL_SHADER_STORAGE_BUFFER          0x90D2
+#define GL_SHADER_STORAGE_BUFFER_BINDING  0x90D3
+#define GL_SHADER_STORAGE_BUFFER_START    0x90D4
+#define GL_SHADER_STORAGE_BUFFER_SIZE     0x90D5
+#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6
+#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7
+#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8
+#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9
+#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA
+#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB
+#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC
+#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD
+#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE  0x90DE
+#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF
+#define GL_SHADER_STORAGE_BARRIER_BIT     0x00002000
+#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39
+#define GL_DEPTH_STENCIL_TEXTURE_MODE     0x90EA
+#define GL_TEXTURE_BUFFER_OFFSET          0x919D
+#define GL_TEXTURE_BUFFER_SIZE            0x919E
+#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F
+#define GL_TEXTURE_VIEW_MIN_LEVEL         0x82DB
+#define GL_TEXTURE_VIEW_NUM_LEVELS        0x82DC
+#define GL_TEXTURE_VIEW_MIN_LAYER         0x82DD
+#define GL_TEXTURE_VIEW_NUM_LAYERS        0x82DE
+#define GL_TEXTURE_IMMUTABLE_LEVELS       0x82DF
+#define GL_VERTEX_ATTRIB_BINDING          0x82D4
+#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET  0x82D5
+#define GL_VERTEX_BINDING_DIVISOR         0x82D6
+#define GL_VERTEX_BINDING_OFFSET          0x82D7
+#define GL_VERTEX_BINDING_STRIDE          0x82D8
+#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9
+#define GL_MAX_VERTEX_ATTRIB_BINDINGS     0x82DA
+#define GL_VERTEX_BINDING_BUFFER          0x8F4F
+#define GL_DISPLAY_LIST                   0x82E7
+typedef void (APIENTRYP PFNGLCLEARBUFFERDATAPROC) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARBUFFERSUBDATAPROC) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEINDIRECTPROC) (GLintptr indirect);
+typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATAPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINTERNALFORMATI64VPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params);
+typedef void (APIENTRYP PFNGLINVALIDATETEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLINVALIDATETEXIMAGEPROC) (GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLINVALIDATEBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLINVALIDATEBUFFERDATAPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLINVALIDATEFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+typedef void (APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLGETPROGRAMINTERFACEIVPROC) (GLuint program, GLenum programInterface, GLenum pname, GLint *params);
+typedef GLuint (APIENTRYP PFNGLGETPROGRAMRESOURCEINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCENAMEPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEIVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
+typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef void (APIENTRYP PFNGLSHADERSTORAGEBLOCKBINDINGPROC) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
+typedef void (APIENTRYP PFNGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTUREVIEWPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERPROC) (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex);
+typedef void (APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+typedef void (APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+typedef void (APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void);
+typedef void (APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+typedef void (APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClearBufferData (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearBufferSubData (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glDispatchCompute (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
+GLAPI void APIENTRY glDispatchComputeIndirect (GLintptr indirect);
+GLAPI void APIENTRY glCopyImageSubData (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+GLAPI void APIENTRY glFramebufferParameteri (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glGetFramebufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params);
+GLAPI void APIENTRY glInvalidateTexSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glInvalidateTexImage (GLuint texture, GLint level);
+GLAPI void APIENTRY glInvalidateBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glInvalidateBufferData (GLuint buffer);
+GLAPI void APIENTRY glInvalidateFramebuffer (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+GLAPI void APIENTRY glInvalidateSubFramebuffer (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glMultiDrawArraysIndirect (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirect (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
+GLAPI void APIENTRY glGetProgramInterfaceiv (GLuint program, GLenum programInterface, GLenum pname, GLint *params);
+GLAPI GLuint APIENTRY glGetProgramResourceIndex (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI void APIENTRY glGetProgramResourceName (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glGetProgramResourceiv (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
+GLAPI GLint APIENTRY glGetProgramResourceLocation (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI GLint APIENTRY glGetProgramResourceLocationIndex (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI void APIENTRY glShaderStorageBlockBinding (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
+GLAPI void APIENTRY glTexBufferRange (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glTexStorage2DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexStorage3DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureView (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+GLAPI void APIENTRY glBindVertexBuffer (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribFormat (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribIFormat (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribLFormat (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribBinding (GLuint attribindex, GLuint bindingindex);
+GLAPI void APIENTRY glVertexBindingDivisor (GLuint bindingindex, GLuint divisor);
+GLAPI void APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+GLAPI void APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+GLAPI void APIENTRY glPopDebugGroup (void);
+GLAPI void APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+GLAPI void APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+#endif /* GL_VERSION_4_3 */
+
+#ifndef GL_VERSION_4_4
+#define GL_VERSION_4_4 1
+#define GL_MAX_VERTEX_ATTRIB_STRIDE       0x82E5
+#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221
+#define GL_TEXTURE_BUFFER_BINDING         0x8C2A
+#define GL_MAP_PERSISTENT_BIT             0x0040
+#define GL_MAP_COHERENT_BIT               0x0080
+#define GL_DYNAMIC_STORAGE_BIT            0x0100
+#define GL_CLIENT_STORAGE_BIT             0x0200
+#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT 0x00004000
+#define GL_BUFFER_IMMUTABLE_STORAGE       0x821F
+#define GL_BUFFER_STORAGE_FLAGS           0x8220
+#define GL_CLEAR_TEXTURE                  0x9365
+#define GL_LOCATION_COMPONENT             0x934A
+#define GL_TRANSFORM_FEEDBACK_BUFFER_INDEX 0x934B
+#define GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE 0x934C
+#define GL_QUERY_BUFFER                   0x9192
+#define GL_QUERY_BUFFER_BARRIER_BIT       0x00008000
+#define GL_QUERY_BUFFER_BINDING           0x9193
+#define GL_QUERY_RESULT_NO_WAIT           0x9194
+#define GL_MIRROR_CLAMP_TO_EDGE           0x8743
+typedef void (APIENTRYP PFNGLBUFFERSTORAGEPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLCLEARTEXIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARTEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLBINDBUFFERSBASEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLBINDBUFFERSRANGEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes);
+typedef void (APIENTRYP PFNGLBINDTEXTURESPROC) (GLuint first, GLsizei count, const GLuint *textures);
+typedef void (APIENTRYP PFNGLBINDSAMPLERSPROC) (GLuint first, GLsizei count, const GLuint *samplers);
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTURESPROC) (GLuint first, GLsizei count, const GLuint *textures);
+typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERSPROC) (GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferStorage (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glClearTexImage (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearTexSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glBindBuffersBase (GLenum target, GLuint first, GLsizei count, const GLuint *buffers);
+GLAPI void APIENTRY glBindBuffersRange (GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes);
+GLAPI void APIENTRY glBindTextures (GLuint first, GLsizei count, const GLuint *textures);
+GLAPI void APIENTRY glBindSamplers (GLuint first, GLsizei count, const GLuint *samplers);
+GLAPI void APIENTRY glBindImageTextures (GLuint first, GLsizei count, const GLuint *textures);
+GLAPI void APIENTRY glBindVertexBuffers (GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+#endif
+#endif /* GL_VERSION_4_4 */
+
+#ifndef GL_VERSION_4_5
+#define GL_VERSION_4_5 1
+#define GL_CONTEXT_LOST                   0x0507
+#define GL_NEGATIVE_ONE_TO_ONE            0x935E
+#define GL_ZERO_TO_ONE                    0x935F
+#define GL_CLIP_ORIGIN                    0x935C
+#define GL_CLIP_DEPTH_MODE                0x935D
+#define GL_QUERY_WAIT_INVERTED            0x8E17
+#define GL_QUERY_NO_WAIT_INVERTED         0x8E18
+#define GL_QUERY_BY_REGION_WAIT_INVERTED  0x8E19
+#define GL_QUERY_BY_REGION_NO_WAIT_INVERTED 0x8E1A
+#define GL_MAX_CULL_DISTANCES             0x82F9
+#define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES 0x82FA
+#define GL_TEXTURE_TARGET                 0x1006
+#define GL_QUERY_TARGET                   0x82EA
+#define GL_GUILTY_CONTEXT_RESET           0x8253
+#define GL_INNOCENT_CONTEXT_RESET         0x8254
+#define GL_UNKNOWN_CONTEXT_RESET          0x8255
+#define GL_RESET_NOTIFICATION_STRATEGY    0x8256
+#define GL_LOSE_CONTEXT_ON_RESET          0x8252
+#define GL_NO_RESET_NOTIFICATION          0x8261
+#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT 0x00000004
+#define GL_CONTEXT_RELEASE_BEHAVIOR       0x82FB
+#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC
+typedef void (APIENTRYP PFNGLCLIPCONTROLPROC) (GLenum origin, GLenum depth);
+typedef void (APIENTRYP PFNGLCREATETRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC) (GLuint xfb, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKIVPROC) (GLuint xfb, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint *param);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI64_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint64 *param);
+typedef void (APIENTRYP PFNGLCREATEBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERPROC) (GLuint buffer, GLenum access);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERI64VPROC) (GLuint buffer, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVPROC) (GLuint buffer, GLenum pname, void **params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+typedef void (APIENTRYP PFNGLCREATEFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC) (GLuint framebuffer, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC) (GLuint framebuffer, GLenum buf);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC) (GLuint framebuffer, GLenum src);
+typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments);
+typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef void (APIENTRYP PFNGLBLITNAMEDFRAMEBUFFERPROC) (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC) (GLuint framebuffer, GLenum target);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC) (GLuint framebuffer, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCREATERENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCREATETEXTURESPROC) (GLenum target, GLsizei n, GLuint *textures);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFERPROC) (GLuint texture, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFPROC) (GLuint texture, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIPROC) (GLuint texture, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLBINDTEXTUREUNITPROC) (GLuint unit, GLuint texture);
+typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVPROC) (GLuint texture, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVPROC) (GLuint texture, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCREATEVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLVERTEXARRAYELEMENTBUFFERPROC) (GLuint vaobj, GLuint buffer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBUFFERPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBUFFERSPROC) (GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBBINDINGPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBIFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBLFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYBINDINGDIVISORPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYIVPROC) (GLuint vaobj, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINDEXEDIVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINDEXED64IVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint64 *param);
+typedef void (APIENTRYP PFNGLCREATESAMPLERSPROC) (GLsizei n, GLuint *samplers);
+typedef void (APIENTRYP PFNGLCREATEPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines);
+typedef void (APIENTRYP PFNGLCREATEQUERIESPROC) (GLenum target, GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTI64VPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTIVPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTUI64VPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTUIVPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLMEMORYBARRIERBYREGIONPROC) (GLbitfield barriers);
+typedef void (APIENTRYP PFNGLGETTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels);
+typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSPROC) (void);
+typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETNTEXIMAGEPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETNUNIFORMDVPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMFVPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMUIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+typedef void (APIENTRYP PFNGLREADNPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+typedef void (APIENTRYP PFNGLGETNMAPDVPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+typedef void (APIENTRYP PFNGLGETNMAPFVPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+typedef void (APIENTRYP PFNGLGETNMAPIVPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPFVPROC) (GLenum map, GLsizei bufSize, GLfloat *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVPROC) (GLenum map, GLsizei bufSize, GLuint *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVPROC) (GLenum map, GLsizei bufSize, GLushort *values);
+typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEPROC) (GLsizei bufSize, GLubyte *pattern);
+typedef void (APIENTRYP PFNGLGETNCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+typedef void (APIENTRYP PFNGLGETNHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+typedef void (APIENTRYP PFNGLGETNMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+typedef void (APIENTRYP PFNGLTEXTUREBARRIERPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClipControl (GLenum origin, GLenum depth);
+GLAPI void APIENTRY glCreateTransformFeedbacks (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glTransformFeedbackBufferBase (GLuint xfb, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackBufferRange (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glGetTransformFeedbackiv (GLuint xfb, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetTransformFeedbacki_v (GLuint xfb, GLenum pname, GLuint index, GLint *param);
+GLAPI void APIENTRY glGetTransformFeedbacki64_v (GLuint xfb, GLenum pname, GLuint index, GLint64 *param);
+GLAPI void APIENTRY glCreateBuffers (GLsizei n, GLuint *buffers);
+GLAPI void APIENTRY glNamedBufferStorage (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glNamedBufferData (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glCopyNamedBufferSubData (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glClearNamedBufferData (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearNamedBufferSubData (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+GLAPI void *APIENTRY glMapNamedBuffer (GLuint buffer, GLenum access);
+GLAPI void *APIENTRY glMapNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI GLboolean APIENTRY glUnmapNamedBuffer (GLuint buffer);
+GLAPI void APIENTRY glFlushMappedNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glGetNamedBufferParameteriv (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedBufferParameteri64v (GLuint buffer, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetNamedBufferPointerv (GLuint buffer, GLenum pname, void **params);
+GLAPI void APIENTRY glGetNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+GLAPI void APIENTRY glCreateFramebuffers (GLsizei n, GLuint *framebuffers);
+GLAPI void APIENTRY glNamedFramebufferRenderbuffer (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glNamedFramebufferParameteri (GLuint framebuffer, GLenum pname, GLint param);
+GLAPI void APIENTRY glNamedFramebufferTexture (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTextureLayer (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glNamedFramebufferDrawBuffer (GLuint framebuffer, GLenum buf);
+GLAPI void APIENTRY glNamedFramebufferDrawBuffers (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glNamedFramebufferReadBuffer (GLuint framebuffer, GLenum src);
+GLAPI void APIENTRY glInvalidateNamedFramebufferData (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments);
+GLAPI void APIENTRY glInvalidateNamedFramebufferSubData (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glClearNamedFramebufferiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value);
+GLAPI void APIENTRY glClearNamedFramebufferuiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value);
+GLAPI void APIENTRY glClearNamedFramebufferfv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value);
+GLAPI void APIENTRY glClearNamedFramebufferfi (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GLAPI void APIENTRY glBlitNamedFramebuffer (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI GLenum APIENTRY glCheckNamedFramebufferStatus (GLuint framebuffer, GLenum target);
+GLAPI void APIENTRY glGetNamedFramebufferParameteriv (GLuint framebuffer, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameteriv (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glCreateRenderbuffers (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glNamedRenderbufferStorage (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisample (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetNamedRenderbufferParameteriv (GLuint renderbuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glCreateTextures (GLenum target, GLsizei n, GLuint *textures);
+GLAPI void APIENTRY glTextureBuffer (GLuint texture, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glTextureBufferRange (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glTextureStorage1D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTextureStorage2D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTextureStorage3D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glTextureStorage2DMultisample (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureStorage3DMultisample (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureSubImage1D (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage2D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage3D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCompressedTextureSubImage1D (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTextureSubImage2D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTextureSubImage3D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCopyTextureSubImage1D (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTextureSubImage2D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glCopyTextureSubImage3D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTextureParameterf (GLuint texture, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glTextureParameterfv (GLuint texture, GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glTextureParameteri (GLuint texture, GLenum pname, GLint param);
+GLAPI void APIENTRY glTextureParameterIiv (GLuint texture, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureParameterIuiv (GLuint texture, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glTextureParameteriv (GLuint texture, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glGenerateTextureMipmap (GLuint texture);
+GLAPI void APIENTRY glBindTextureUnit (GLuint unit, GLuint texture);
+GLAPI void APIENTRY glGetTextureImage (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetCompressedTextureImage (GLuint texture, GLint level, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetTextureLevelParameterfv (GLuint texture, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureLevelParameteriv (GLuint texture, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterfv (GLuint texture, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureParameterIiv (GLuint texture, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterIuiv (GLuint texture, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glGetTextureParameteriv (GLuint texture, GLenum pname, GLint *params);
+GLAPI void APIENTRY glCreateVertexArrays (GLsizei n, GLuint *arrays);
+GLAPI void APIENTRY glDisableVertexArrayAttrib (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glEnableVertexArrayAttrib (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glVertexArrayElementBuffer (GLuint vaobj, GLuint buffer);
+GLAPI void APIENTRY glVertexArrayVertexBuffer (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+GLAPI void APIENTRY glVertexArrayVertexBuffers (GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+GLAPI void APIENTRY glVertexArrayAttribBinding (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+GLAPI void APIENTRY glVertexArrayAttribFormat (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayAttribIFormat (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayAttribLFormat (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayBindingDivisor (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+GLAPI void APIENTRY glGetVertexArrayiv (GLuint vaobj, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayIndexediv (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayIndexed64iv (GLuint vaobj, GLuint index, GLenum pname, GLint64 *param);
+GLAPI void APIENTRY glCreateSamplers (GLsizei n, GLuint *samplers);
+GLAPI void APIENTRY glCreateProgramPipelines (GLsizei n, GLuint *pipelines);
+GLAPI void APIENTRY glCreateQueries (GLenum target, GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glGetQueryBufferObjecti64v (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glGetQueryBufferObjectiv (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glGetQueryBufferObjectui64v (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glGetQueryBufferObjectuiv (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glMemoryBarrierByRegion (GLbitfield barriers);
+GLAPI void APIENTRY glGetTextureSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetCompressedTextureSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels);
+GLAPI GLenum APIENTRY glGetGraphicsResetStatus (void);
+GLAPI void APIENTRY glGetnCompressedTexImage (GLenum target, GLint lod, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetnTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetnUniformdv (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+GLAPI void APIENTRY glGetnUniformfv (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+GLAPI void APIENTRY glGetnUniformiv (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+GLAPI void APIENTRY glGetnUniformuiv (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+GLAPI void APIENTRY glReadnPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+GLAPI void APIENTRY glGetnMapdv (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+GLAPI void APIENTRY glGetnMapfv (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+GLAPI void APIENTRY glGetnMapiv (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+GLAPI void APIENTRY glGetnPixelMapfv (GLenum map, GLsizei bufSize, GLfloat *values);
+GLAPI void APIENTRY glGetnPixelMapuiv (GLenum map, GLsizei bufSize, GLuint *values);
+GLAPI void APIENTRY glGetnPixelMapusv (GLenum map, GLsizei bufSize, GLushort *values);
+GLAPI void APIENTRY glGetnPolygonStipple (GLsizei bufSize, GLubyte *pattern);
+GLAPI void APIENTRY glGetnColorTable (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+GLAPI void APIENTRY glGetnConvolutionFilter (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+GLAPI void APIENTRY glGetnSeparableFilter (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+GLAPI void APIENTRY glGetnHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+GLAPI void APIENTRY glGetnMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+GLAPI void APIENTRY glTextureBarrier (void);
+#endif
+#endif /* GL_VERSION_4_5 */
+
+#ifndef GL_ARB_ES2_compatibility
+#define GL_ARB_ES2_compatibility 1
+#endif /* GL_ARB_ES2_compatibility */
+
+#ifndef GL_ARB_ES3_1_compatibility
+#define GL_ARB_ES3_1_compatibility 1
+#endif /* GL_ARB_ES3_1_compatibility */
+
+#ifndef GL_ARB_ES3_2_compatibility
+#define GL_ARB_ES3_2_compatibility 1
+#define GL_PRIMITIVE_BOUNDING_BOX_ARB     0x92BE
+#define GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB 0x9381
+#define GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB 0x9382
+typedef void (APIENTRYP PFNGLPRIMITIVEBOUNDINGBOXARBPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveBoundingBoxARB (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
+#endif
+#endif /* GL_ARB_ES3_2_compatibility */
+
+#ifndef GL_ARB_ES3_compatibility
+#define GL_ARB_ES3_compatibility 1
+#endif /* GL_ARB_ES3_compatibility */
+
+#ifndef GL_ARB_arrays_of_arrays
+#define GL_ARB_arrays_of_arrays 1
+#endif /* GL_ARB_arrays_of_arrays */
+
+#ifndef GL_ARB_base_instance
+#define GL_ARB_base_instance 1
+#endif /* GL_ARB_base_instance */
+
+#ifndef GL_ARB_bindless_texture
+#define GL_ARB_bindless_texture 1
+typedef uint64_t GLuint64EXT;
+#define GL_UNSIGNED_INT64_ARB             0x140F
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLEARBPROC) (GLuint texture);
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC) (GLuint64 handle);
+typedef GLuint64 (APIENTRYP PFNGLGETIMAGEHANDLEARBPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64ARBPROC) (GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC) (GLuint program, GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64ARBPROC) (GLuint index, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VARBPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VARBPROC) (GLuint index, GLenum pname, GLuint64EXT *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint64 APIENTRY glGetTextureHandleARB (GLuint texture);
+GLAPI GLuint64 APIENTRY glGetTextureSamplerHandleARB (GLuint texture, GLuint sampler);
+GLAPI void APIENTRY glMakeTextureHandleResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glMakeTextureHandleNonResidentARB (GLuint64 handle);
+GLAPI GLuint64 APIENTRY glGetImageHandleARB (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+GLAPI void APIENTRY glMakeImageHandleResidentARB (GLuint64 handle, GLenum access);
+GLAPI void APIENTRY glMakeImageHandleNonResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glUniformHandleui64ARB (GLint location, GLuint64 value);
+GLAPI void APIENTRY glUniformHandleui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniformHandleui64ARB (GLuint program, GLint location, GLuint64 value);
+GLAPI void APIENTRY glProgramUniformHandleui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+GLAPI GLboolean APIENTRY glIsTextureHandleResidentARB (GLuint64 handle);
+GLAPI GLboolean APIENTRY glIsImageHandleResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glVertexAttribL1ui64ARB (GLuint index, GLuint64EXT x);
+GLAPI void APIENTRY glVertexAttribL1ui64vARB (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glGetVertexAttribLui64vARB (GLuint index, GLenum pname, GLuint64EXT *params);
+#endif
+#endif /* GL_ARB_bindless_texture */
+
+#ifndef GL_ARB_blend_func_extended
+#define GL_ARB_blend_func_extended 1
+#endif /* GL_ARB_blend_func_extended */
+
+#ifndef GL_ARB_buffer_storage
+#define GL_ARB_buffer_storage 1
+#endif /* GL_ARB_buffer_storage */
+
+#ifndef GL_ARB_cl_event
+#define GL_ARB_cl_event 1
+struct _cl_context;
+struct _cl_event;
+#define GL_SYNC_CL_EVENT_ARB              0x8240
+#define GL_SYNC_CL_EVENT_COMPLETE_ARB     0x8241
+typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context *context, struct _cl_event *event, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLsync APIENTRY glCreateSyncFromCLeventARB (struct _cl_context *context, struct _cl_event *event, GLbitfield flags);
+#endif
+#endif /* GL_ARB_cl_event */
+
+#ifndef GL_ARB_clear_buffer_object
+#define GL_ARB_clear_buffer_object 1
+#endif /* GL_ARB_clear_buffer_object */
+
+#ifndef GL_ARB_clear_texture
+#define GL_ARB_clear_texture 1
+#endif /* GL_ARB_clear_texture */
+
+#ifndef GL_ARB_clip_control
+#define GL_ARB_clip_control 1
+#endif /* GL_ARB_clip_control */
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_ARB_color_buffer_float 1
+#define GL_RGBA_FLOAT_MODE_ARB            0x8820
+#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
+#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
+#define GL_CLAMP_READ_COLOR_ARB           0x891C
+#define GL_FIXED_ONLY_ARB                 0x891D
+typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClampColorARB (GLenum target, GLenum clamp);
+#endif
+#endif /* GL_ARB_color_buffer_float */
+
+#ifndef GL_ARB_compatibility
+#define GL_ARB_compatibility 1
+#endif /* GL_ARB_compatibility */
+
+#ifndef GL_ARB_compressed_texture_pixel_storage
+#define GL_ARB_compressed_texture_pixel_storage 1
+#endif /* GL_ARB_compressed_texture_pixel_storage */
+
+#ifndef GL_ARB_compute_shader
+#define GL_ARB_compute_shader 1
+#endif /* GL_ARB_compute_shader */
+
+#ifndef GL_ARB_compute_variable_group_size
+#define GL_ARB_compute_variable_group_size 1
+#define GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB 0x9344
+#define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB 0x90EB
+#define GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB 0x9345
+#define GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB 0x91BF
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDispatchComputeGroupSizeARB (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z);
+#endif
+#endif /* GL_ARB_compute_variable_group_size */
+
+#ifndef GL_ARB_conditional_render_inverted
+#define GL_ARB_conditional_render_inverted 1
+#endif /* GL_ARB_conditional_render_inverted */
+
+#ifndef GL_ARB_conservative_depth
+#define GL_ARB_conservative_depth 1
+#endif /* GL_ARB_conservative_depth */
+
+#ifndef GL_ARB_copy_buffer
+#define GL_ARB_copy_buffer 1
+#endif /* GL_ARB_copy_buffer */
+
+#ifndef GL_ARB_copy_image
+#define GL_ARB_copy_image 1
+#endif /* GL_ARB_copy_image */
+
+#ifndef GL_ARB_cull_distance
+#define GL_ARB_cull_distance 1
+#endif /* GL_ARB_cull_distance */
+
+#ifndef GL_ARB_debug_output
+#define GL_ARB_debug_output 1
+typedef void (APIENTRY  *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB   0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION_ARB    0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM_ARB  0x8245
+#define GL_DEBUG_SOURCE_API_ARB           0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB   0x8249
+#define GL_DEBUG_SOURCE_APPLICATION_ARB   0x824A
+#define GL_DEBUG_SOURCE_OTHER_ARB         0x824B
+#define GL_DEBUG_TYPE_ERROR_ARB           0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E
+#define GL_DEBUG_TYPE_PORTABILITY_ARB     0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE_ARB     0x8250
+#define GL_DEBUG_TYPE_OTHER_ARB           0x8251
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB   0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB  0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_ARB      0x9145
+#define GL_DEBUG_SEVERITY_HIGH_ARB        0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_ARB      0x9147
+#define GL_DEBUG_SEVERITY_LOW_ARB         0x9148
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDebugMessageControlARB (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsertARB (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, const void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLogARB (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+#endif
+#endif /* GL_ARB_debug_output */
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_ARB_depth_buffer_float 1
+#endif /* GL_ARB_depth_buffer_float */
+
+#ifndef GL_ARB_depth_clamp
+#define GL_ARB_depth_clamp 1
+#endif /* GL_ARB_depth_clamp */
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+#define GL_DEPTH_COMPONENT16_ARB          0x81A5
+#define GL_DEPTH_COMPONENT24_ARB          0x81A6
+#define GL_DEPTH_COMPONENT32_ARB          0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
+#endif /* GL_ARB_depth_texture */
+
+#ifndef GL_ARB_derivative_control
+#define GL_ARB_derivative_control 1
+#endif /* GL_ARB_derivative_control */
+
+#ifndef GL_ARB_direct_state_access
+#define GL_ARB_direct_state_access 1
+#endif /* GL_ARB_direct_state_access */
+
+#ifndef GL_ARB_draw_buffers
+#define GL_ARB_draw_buffers 1
+#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
+#define GL_DRAW_BUFFER0_ARB               0x8825
+#define GL_DRAW_BUFFER1_ARB               0x8826
+#define GL_DRAW_BUFFER2_ARB               0x8827
+#define GL_DRAW_BUFFER3_ARB               0x8828
+#define GL_DRAW_BUFFER4_ARB               0x8829
+#define GL_DRAW_BUFFER5_ARB               0x882A
+#define GL_DRAW_BUFFER6_ARB               0x882B
+#define GL_DRAW_BUFFER7_ARB               0x882C
+#define GL_DRAW_BUFFER8_ARB               0x882D
+#define GL_DRAW_BUFFER9_ARB               0x882E
+#define GL_DRAW_BUFFER10_ARB              0x882F
+#define GL_DRAW_BUFFER11_ARB              0x8830
+#define GL_DRAW_BUFFER12_ARB              0x8831
+#define GL_DRAW_BUFFER13_ARB              0x8832
+#define GL_DRAW_BUFFER14_ARB              0x8833
+#define GL_DRAW_BUFFER15_ARB              0x8834
+typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersARB (GLsizei n, const GLenum *bufs);
+#endif
+#endif /* GL_ARB_draw_buffers */
+
+#ifndef GL_ARB_draw_buffers_blend
+#define GL_ARB_draw_buffers_blend 1
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationiARB (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparateiARB (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunciARB (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif
+#endif /* GL_ARB_draw_buffers_blend */
+
+#ifndef GL_ARB_draw_elements_base_vertex
+#define GL_ARB_draw_elements_base_vertex 1
+#endif /* GL_ARB_draw_elements_base_vertex */
+
+#ifndef GL_ARB_draw_indirect
+#define GL_ARB_draw_indirect 1
+#endif /* GL_ARB_draw_indirect */
+
+#ifndef GL_ARB_draw_instanced
+#define GL_ARB_draw_instanced 1
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#endif
+#endif /* GL_ARB_draw_instanced */
+
+#ifndef GL_ARB_enhanced_layouts
+#define GL_ARB_enhanced_layouts 1
+#endif /* GL_ARB_enhanced_layouts */
+
+#ifndef GL_ARB_explicit_attrib_location
+#define GL_ARB_explicit_attrib_location 1
+#endif /* GL_ARB_explicit_attrib_location */
+
+#ifndef GL_ARB_explicit_uniform_location
+#define GL_ARB_explicit_uniform_location 1
+#endif /* GL_ARB_explicit_uniform_location */
+
+#ifndef GL_ARB_fragment_coord_conventions
+#define GL_ARB_fragment_coord_conventions 1
+#endif /* GL_ARB_fragment_coord_conventions */
+
+#ifndef GL_ARB_fragment_layer_viewport
+#define GL_ARB_fragment_layer_viewport 1
+#endif /* GL_ARB_fragment_layer_viewport */
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+#define GL_FRAGMENT_PROGRAM_ARB           0x8804
+#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
+#define GL_PROGRAM_LENGTH_ARB             0x8627
+#define GL_PROGRAM_FORMAT_ARB             0x8876
+#define GL_PROGRAM_BINDING_ARB            0x8677
+#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_PROGRAM_STRING_ARB             0x8628
+#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
+#define GL_CURRENT_MATRIX_ARB             0x8641
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
+#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
+#define GL_MATRIX0_ARB                    0x88C0
+#define GL_MATRIX1_ARB                    0x88C1
+#define GL_MATRIX2_ARB                    0x88C2
+#define GL_MATRIX3_ARB                    0x88C3
+#define GL_MATRIX4_ARB                    0x88C4
+#define GL_MATRIX5_ARB                    0x88C5
+#define GL_MATRIX6_ARB                    0x88C6
+#define GL_MATRIX7_ARB                    0x88C7
+#define GL_MATRIX8_ARB                    0x88C8
+#define GL_MATRIX9_ARB                    0x88C9
+#define GL_MATRIX10_ARB                   0x88CA
+#define GL_MATRIX11_ARB                   0x88CB
+#define GL_MATRIX12_ARB                   0x88CC
+#define GL_MATRIX13_ARB                   0x88CD
+#define GL_MATRIX14_ARB                   0x88CE
+#define GL_MATRIX15_ARB                   0x88CF
+#define GL_MATRIX16_ARB                   0x88D0
+#define GL_MATRIX17_ARB                   0x88D1
+#define GL_MATRIX18_ARB                   0x88D2
+#define GL_MATRIX19_ARB                   0x88D3
+#define GL_MATRIX20_ARB                   0x88D4
+#define GL_MATRIX21_ARB                   0x88D5
+#define GL_MATRIX22_ARB                   0x88D6
+#define GL_MATRIX23_ARB                   0x88D7
+#define GL_MATRIX24_ARB                   0x88D8
+#define GL_MATRIX25_ARB                   0x88D9
+#define GL_MATRIX26_ARB                   0x88DA
+#define GL_MATRIX27_ARB                   0x88DB
+#define GL_MATRIX28_ARB                   0x88DC
+#define GL_MATRIX29_ARB                   0x88DD
+#define GL_MATRIX30_ARB                   0x88DE
+#define GL_MATRIX31_ARB                   0x88DF
+typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const void *string);
+typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, void *string);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramStringARB (GLenum target, GLenum format, GLsizei len, const void *string);
+GLAPI void APIENTRY glBindProgramARB (GLenum target, GLuint program);
+GLAPI void APIENTRY glDeleteProgramsARB (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glGenProgramsARB (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringARB (GLenum target, GLenum pname, void *string);
+GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program);
+#endif
+#endif /* GL_ARB_fragment_program */
+
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+#endif /* GL_ARB_fragment_program_shadow */
+
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+#define GL_FRAGMENT_SHADER_ARB            0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+#endif /* GL_ARB_fragment_shader */
+
+#ifndef GL_ARB_fragment_shader_interlock
+#define GL_ARB_fragment_shader_interlock 1
+#endif /* GL_ARB_fragment_shader_interlock */
+
+#ifndef GL_ARB_framebuffer_no_attachments
+#define GL_ARB_framebuffer_no_attachments 1
+#endif /* GL_ARB_framebuffer_no_attachments */
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_ARB_framebuffer_object 1
+#endif /* GL_ARB_framebuffer_object */
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_ARB_framebuffer_sRGB 1
+#endif /* GL_ARB_framebuffer_sRGB */
+
+#ifndef GL_ARB_geometry_shader4
+#define GL_ARB_geometry_shader4 1
+#define GL_LINES_ADJACENCY_ARB            0x000A
+#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
+#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
+#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
+#define GL_GEOMETRY_SHADER_ARB            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+#endif /* GL_ARB_geometry_shader4 */
+
+#ifndef GL_ARB_get_program_binary
+#define GL_ARB_get_program_binary 1
+#endif /* GL_ARB_get_program_binary */
+
+#ifndef GL_ARB_get_texture_sub_image
+#define GL_ARB_get_texture_sub_image 1
+#endif /* GL_ARB_get_texture_sub_image */
+
+#ifndef GL_ARB_gpu_shader5
+#define GL_ARB_gpu_shader5 1
+#endif /* GL_ARB_gpu_shader5 */
+
+#ifndef GL_ARB_gpu_shader_fp64
+#define GL_ARB_gpu_shader_fp64 1
+#endif /* GL_ARB_gpu_shader_fp64 */
+
+#ifndef GL_ARB_gpu_shader_int64
+#define GL_ARB_gpu_shader_int64 1
+#define GL_INT64_ARB                      0x140E
+#define GL_INT64_VEC2_ARB                 0x8FE9
+#define GL_INT64_VEC3_ARB                 0x8FEA
+#define GL_INT64_VEC4_ARB                 0x8FEB
+#define GL_UNSIGNED_INT64_VEC2_ARB        0x8FF5
+#define GL_UNSIGNED_INT64_VEC3_ARB        0x8FF6
+#define GL_UNSIGNED_INT64_VEC4_ARB        0x8FF7
+typedef void (APIENTRYP PFNGLUNIFORM1I64ARBPROC) (GLint location, GLint64 x);
+typedef void (APIENTRYP PFNGLUNIFORM2I64ARBPROC) (GLint location, GLint64 x, GLint64 y);
+typedef void (APIENTRYP PFNGLUNIFORM3I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z);
+typedef void (APIENTRYP PFNGLUNIFORM4I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+typedef void (APIENTRYP PFNGLUNIFORM1I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM2I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM3I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM4I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64ARBPROC) (GLint location, GLuint64 x);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMI64VARBPROC) (GLuint program, GLint location, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLuint64 *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint64 *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64ARBPROC) (GLuint program, GLint location, GLint64 x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64ARBPROC) (GLuint program, GLint location, GLuint64 x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniform1i64ARB (GLint location, GLint64 x);
+GLAPI void APIENTRY glUniform2i64ARB (GLint location, GLint64 x, GLint64 y);
+GLAPI void APIENTRY glUniform3i64ARB (GLint location, GLint64 x, GLint64 y, GLint64 z);
+GLAPI void APIENTRY glUniform4i64ARB (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+GLAPI void APIENTRY glUniform1i64vARB (GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glUniform2i64vARB (GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glUniform3i64vARB (GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glUniform4i64vARB (GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glUniform1ui64ARB (GLint location, GLuint64 x);
+GLAPI void APIENTRY glUniform2ui64ARB (GLint location, GLuint64 x, GLuint64 y);
+GLAPI void APIENTRY glUniform3ui64ARB (GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+GLAPI void APIENTRY glUniform4ui64ARB (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+GLAPI void APIENTRY glUniform1ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glUniform2ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glUniform3ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glUniform4ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glGetUniformi64vARB (GLuint program, GLint location, GLint64 *params);
+GLAPI void APIENTRY glGetUniformui64vARB (GLuint program, GLint location, GLuint64 *params);
+GLAPI void APIENTRY glGetnUniformi64vARB (GLuint program, GLint location, GLsizei bufSize, GLint64 *params);
+GLAPI void APIENTRY glGetnUniformui64vARB (GLuint program, GLint location, GLsizei bufSize, GLuint64 *params);
+GLAPI void APIENTRY glProgramUniform1i64ARB (GLuint program, GLint location, GLint64 x);
+GLAPI void APIENTRY glProgramUniform2i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y);
+GLAPI void APIENTRY glProgramUniform3i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z);
+GLAPI void APIENTRY glProgramUniform4i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+GLAPI void APIENTRY glProgramUniform1i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glProgramUniform2i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glProgramUniform3i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glProgramUniform4i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glProgramUniform1ui64ARB (GLuint program, GLint location, GLuint64 x);
+GLAPI void APIENTRY glProgramUniform2ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y);
+GLAPI void APIENTRY glProgramUniform3ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+GLAPI void APIENTRY glProgramUniform4ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+GLAPI void APIENTRY glProgramUniform1ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniform2ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniform3ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniform4ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+#endif
+#endif /* GL_ARB_gpu_shader_int64 */
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_ARB_half_float_pixel 1
+typedef unsigned short GLhalfARB;
+#define GL_HALF_FLOAT_ARB                 0x140B
+#endif /* GL_ARB_half_float_pixel */
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_ARB_half_float_vertex 1
+#endif /* GL_ARB_half_float_vertex */
+
+#ifndef GL_ARB_imaging
+#define GL_ARB_imaging 1
+#define GL_BLEND_COLOR                    0x8005
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX                         0x802E
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CONSTANT_BORDER                0x8151
+#define GL_REPLICATE_BORDER               0x8153
+#define GL_CONVOLUTION_BORDER_COLOR       0x8154
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, void *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, void *table);
+GLAPI void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, void *image);
+GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+GLAPI void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+GLAPI void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogram (GLenum target);
+GLAPI void APIENTRY glResetMinmax (GLenum target);
+#endif
+#endif /* GL_ARB_imaging */
+
+#ifndef GL_ARB_indirect_parameters
+#define GL_ARB_indirect_parameters 1
+#define GL_PARAMETER_BUFFER_ARB           0x80EE
+#define GL_PARAMETER_BUFFER_BINDING_ARB   0x80EF
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectCountARB (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#endif
+#endif /* GL_ARB_indirect_parameters */
+
+#ifndef GL_ARB_instanced_arrays
+#define GL_ARB_instanced_arrays 1
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor);
+#endif
+#endif /* GL_ARB_instanced_arrays */
+
+#ifndef GL_ARB_internalformat_query
+#define GL_ARB_internalformat_query 1
+#endif /* GL_ARB_internalformat_query */
+
+#ifndef GL_ARB_internalformat_query2
+#define GL_ARB_internalformat_query2 1
+#define GL_SRGB_DECODE_ARB                0x8299
+#endif /* GL_ARB_internalformat_query2 */
+
+#ifndef GL_ARB_invalidate_subdata
+#define GL_ARB_invalidate_subdata 1
+#endif /* GL_ARB_invalidate_subdata */
+
+#ifndef GL_ARB_map_buffer_alignment
+#define GL_ARB_map_buffer_alignment 1
+#endif /* GL_ARB_map_buffer_alignment */
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_ARB_map_buffer_range 1
+#endif /* GL_ARB_map_buffer_range */
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+#define GL_MATRIX_PALETTE_ARB             0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint index);
+GLAPI void APIENTRY glMatrixIndexubvARB (GLint size, const GLubyte *indices);
+GLAPI void APIENTRY glMatrixIndexusvARB (GLint size, const GLushort *indices);
+GLAPI void APIENTRY glMatrixIndexuivARB (GLint size, const GLuint *indices);
+GLAPI void APIENTRY glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_ARB_matrix_palette */
+
+#ifndef GL_ARB_multi_bind
+#define GL_ARB_multi_bind 1
+#endif /* GL_ARB_multi_bind */
+
+#ifndef GL_ARB_multi_draw_indirect
+#define GL_ARB_multi_draw_indirect 1
+#endif /* GL_ARB_multi_draw_indirect */
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLfloat value, GLboolean invert);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleCoverageARB (GLfloat value, GLboolean invert);
+#endif
+#endif /* GL_ARB_multisample */
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_TEXTURE4_ARB                   0x84C4
+#define GL_TEXTURE5_ARB                   0x84C5
+#define GL_TEXTURE6_ARB                   0x84C6
+#define GL_TEXTURE7_ARB                   0x84C7
+#define GL_TEXTURE8_ARB                   0x84C8
+#define GL_TEXTURE9_ARB                   0x84C9
+#define GL_TEXTURE10_ARB                  0x84CA
+#define GL_TEXTURE11_ARB                  0x84CB
+#define GL_TEXTURE12_ARB                  0x84CC
+#define GL_TEXTURE13_ARB                  0x84CD
+#define GL_TEXTURE14_ARB                  0x84CE
+#define GL_TEXTURE15_ARB                  0x84CF
+#define GL_TEXTURE16_ARB                  0x84D0
+#define GL_TEXTURE17_ARB                  0x84D1
+#define GL_TEXTURE18_ARB                  0x84D2
+#define GL_TEXTURE19_ARB                  0x84D3
+#define GL_TEXTURE20_ARB                  0x84D4
+#define GL_TEXTURE21_ARB                  0x84D5
+#define GL_TEXTURE22_ARB                  0x84D6
+#define GL_TEXTURE23_ARB                  0x84D7
+#define GL_TEXTURE24_ARB                  0x84D8
+#define GL_TEXTURE25_ARB                  0x84D9
+#define GL_TEXTURE26_ARB                  0x84DA
+#define GL_TEXTURE27_ARB                  0x84DB
+#define GL_TEXTURE28_ARB                  0x84DC
+#define GL_TEXTURE29_ARB                  0x84DD
+#define GL_TEXTURE30_ARB                  0x84DE
+#define GL_TEXTURE31_ARB                  0x84DF
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glClientActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v);
+#endif
+#endif /* GL_ARB_multitexture */
+
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+#define GL_QUERY_COUNTER_BITS_ARB         0x8864
+#define GL_CURRENT_QUERY_ARB              0x8865
+#define GL_QUERY_RESULT_ARB               0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
+#define GL_SAMPLES_PASSED_ARB             0x8914
+typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueriesARB (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueriesARB (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQueryARB (GLuint id);
+GLAPI void APIENTRY glBeginQueryARB (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQueryARB (GLenum target);
+GLAPI void APIENTRY glGetQueryivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectivARB (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_ARB_occlusion_query */
+
+#ifndef GL_ARB_occlusion_query2
+#define GL_ARB_occlusion_query2 1
+#endif /* GL_ARB_occlusion_query2 */
+
+#ifndef GL_ARB_parallel_shader_compile
+#define GL_ARB_parallel_shader_compile 1
+#define GL_MAX_SHADER_COMPILER_THREADS_ARB 0x91B0
+#define GL_COMPLETION_STATUS_ARB          0x91B1
+typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSARBPROC) (GLuint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMaxShaderCompilerThreadsARB (GLuint count);
+#endif
+#endif /* GL_ARB_parallel_shader_compile */
+
+#ifndef GL_ARB_pipeline_statistics_query
+#define GL_ARB_pipeline_statistics_query 1
+#define GL_VERTICES_SUBMITTED_ARB         0x82EE
+#define GL_PRIMITIVES_SUBMITTED_ARB       0x82EF
+#define GL_VERTEX_SHADER_INVOCATIONS_ARB  0x82F0
+#define GL_TESS_CONTROL_SHADER_PATCHES_ARB 0x82F1
+#define GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB 0x82F2
+#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB 0x82F3
+#define GL_FRAGMENT_SHADER_INVOCATIONS_ARB 0x82F4
+#define GL_COMPUTE_SHADER_INVOCATIONS_ARB 0x82F5
+#define GL_CLIPPING_INPUT_PRIMITIVES_ARB  0x82F6
+#define GL_CLIPPING_OUTPUT_PRIMITIVES_ARB 0x82F7
+#endif /* GL_ARB_pipeline_statistics_query */
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_ARB_pixel_buffer_object 1
+#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
+#endif /* GL_ARB_pixel_buffer_object */
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+#define GL_POINT_SIZE_MIN_ARB             0x8126
+#define GL_POINT_SIZE_MAX_ARB             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfARB (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_ARB_point_parameters */
+
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif /* GL_ARB_point_sprite */
+
+#ifndef GL_ARB_post_depth_coverage
+#define GL_ARB_post_depth_coverage 1
+#endif /* GL_ARB_post_depth_coverage */
+
+#ifndef GL_ARB_program_interface_query
+#define GL_ARB_program_interface_query 1
+#endif /* GL_ARB_program_interface_query */
+
+#ifndef GL_ARB_provoking_vertex
+#define GL_ARB_provoking_vertex 1
+#endif /* GL_ARB_provoking_vertex */
+
+#ifndef GL_ARB_query_buffer_object
+#define GL_ARB_query_buffer_object 1
+#endif /* GL_ARB_query_buffer_object */
+
+#ifndef GL_ARB_robust_buffer_access_behavior
+#define GL_ARB_robust_buffer_access_behavior 1
+#endif /* GL_ARB_robust_buffer_access_behavior */
+
+#ifndef GL_ARB_robustness
+#define GL_ARB_robustness 1
+#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004
+#define GL_LOSE_CONTEXT_ON_RESET_ARB      0x8252
+#define GL_GUILTY_CONTEXT_RESET_ARB       0x8253
+#define GL_INNOCENT_CONTEXT_RESET_ARB     0x8254
+#define GL_UNKNOWN_CONTEXT_RESET_ARB      0x8255
+#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
+#define GL_NO_RESET_NOTIFICATION_ARB      0x8261
+typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void);
+typedef void (APIENTRYP PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *img);
+typedef void (APIENTRYP PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, void *img);
+typedef void (APIENTRYP PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+typedef void (APIENTRYP PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+typedef void (APIENTRYP PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort *values);
+typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte *pattern);
+typedef void (APIENTRYP PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+typedef void (APIENTRYP PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+typedef void (APIENTRYP PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLenum APIENTRY glGetGraphicsResetStatusARB (void);
+GLAPI void APIENTRY glGetnTexImageARB (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *img);
+GLAPI void APIENTRY glReadnPixelsARB (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+GLAPI void APIENTRY glGetnCompressedTexImageARB (GLenum target, GLint lod, GLsizei bufSize, void *img);
+GLAPI void APIENTRY glGetnUniformfvARB (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+GLAPI void APIENTRY glGetnUniformivARB (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+GLAPI void APIENTRY glGetnUniformuivARB (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+GLAPI void APIENTRY glGetnUniformdvARB (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+GLAPI void APIENTRY glGetnMapdvARB (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+GLAPI void APIENTRY glGetnMapfvARB (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+GLAPI void APIENTRY glGetnMapivARB (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+GLAPI void APIENTRY glGetnPixelMapfvARB (GLenum map, GLsizei bufSize, GLfloat *values);
+GLAPI void APIENTRY glGetnPixelMapuivARB (GLenum map, GLsizei bufSize, GLuint *values);
+GLAPI void APIENTRY glGetnPixelMapusvARB (GLenum map, GLsizei bufSize, GLushort *values);
+GLAPI void APIENTRY glGetnPolygonStippleARB (GLsizei bufSize, GLubyte *pattern);
+GLAPI void APIENTRY glGetnColorTableARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+GLAPI void APIENTRY glGetnConvolutionFilterARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+GLAPI void APIENTRY glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+GLAPI void APIENTRY glGetnHistogramARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+#endif
+#endif /* GL_ARB_robustness */
+
+#ifndef GL_ARB_robustness_isolation
+#define GL_ARB_robustness_isolation 1
+#endif /* GL_ARB_robustness_isolation */
+
+#ifndef GL_ARB_sample_locations
+#define GL_ARB_sample_locations 1
+#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB 0x933D
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB 0x933E
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB 0x933F
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB 0x9340
+#define GL_SAMPLE_LOCATION_ARB            0x8E50
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB 0x9341
+#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB 0x9342
+#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB 0x9343
+typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLEVALUATEDEPTHVALUESARBPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferSampleLocationsfvARB (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glNamedFramebufferSampleLocationsfvARB (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glEvaluateDepthValuesARB (void);
+#endif
+#endif /* GL_ARB_sample_locations */
+
+#ifndef GL_ARB_sample_shading
+#define GL_ARB_sample_shading 1
+#define GL_SAMPLE_SHADING_ARB             0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE_ARB   0x8C37
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGARBPROC) (GLfloat value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShadingARB (GLfloat value);
+#endif
+#endif /* GL_ARB_sample_shading */
+
+#ifndef GL_ARB_sampler_objects
+#define GL_ARB_sampler_objects 1
+#endif /* GL_ARB_sampler_objects */
+
+#ifndef GL_ARB_seamless_cube_map
+#define GL_ARB_seamless_cube_map 1
+#endif /* GL_ARB_seamless_cube_map */
+
+#ifndef GL_ARB_seamless_cubemap_per_texture
+#define GL_ARB_seamless_cubemap_per_texture 1
+#endif /* GL_ARB_seamless_cubemap_per_texture */
+
+#ifndef GL_ARB_separate_shader_objects
+#define GL_ARB_separate_shader_objects 1
+#endif /* GL_ARB_separate_shader_objects */
+
+#ifndef GL_ARB_shader_atomic_counter_ops
+#define GL_ARB_shader_atomic_counter_ops 1
+#endif /* GL_ARB_shader_atomic_counter_ops */
+
+#ifndef GL_ARB_shader_atomic_counters
+#define GL_ARB_shader_atomic_counters 1
+#endif /* GL_ARB_shader_atomic_counters */
+
+#ifndef GL_ARB_shader_ballot
+#define GL_ARB_shader_ballot 1
+#endif /* GL_ARB_shader_ballot */
+
+#ifndef GL_ARB_shader_bit_encoding
+#define GL_ARB_shader_bit_encoding 1
+#endif /* GL_ARB_shader_bit_encoding */
+
+#ifndef GL_ARB_shader_clock
+#define GL_ARB_shader_clock 1
+#endif /* GL_ARB_shader_clock */
+
+#ifndef GL_ARB_shader_draw_parameters
+#define GL_ARB_shader_draw_parameters 1
+#endif /* GL_ARB_shader_draw_parameters */
+
+#ifndef GL_ARB_shader_group_vote
+#define GL_ARB_shader_group_vote 1
+#endif /* GL_ARB_shader_group_vote */
+
+#ifndef GL_ARB_shader_image_load_store
+#define GL_ARB_shader_image_load_store 1
+#endif /* GL_ARB_shader_image_load_store */
+
+#ifndef GL_ARB_shader_image_size
+#define GL_ARB_shader_image_size 1
+#endif /* GL_ARB_shader_image_size */
+
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+#ifdef __APPLE__
+typedef void *GLhandleARB;
+#else
+typedef unsigned int GLhandleARB;
+#endif
+typedef char GLcharARB;
+#define GL_PROGRAM_OBJECT_ARB             0x8B40
+#define GL_SHADER_OBJECT_ARB              0x8B48
+#define GL_OBJECT_TYPE_ARB                0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
+#define GL_FLOAT_VEC2_ARB                 0x8B50
+#define GL_FLOAT_VEC3_ARB                 0x8B51
+#define GL_FLOAT_VEC4_ARB                 0x8B52
+#define GL_INT_VEC2_ARB                   0x8B53
+#define GL_INT_VEC3_ARB                   0x8B54
+#define GL_INT_VEC4_ARB                   0x8B55
+#define GL_BOOL_ARB                       0x8B56
+#define GL_BOOL_VEC2_ARB                  0x8B57
+#define GL_BOOL_VEC3_ARB                  0x8B58
+#define GL_BOOL_VEC4_ARB                  0x8B59
+#define GL_FLOAT_MAT2_ARB                 0x8B5A
+#define GL_FLOAT_MAT3_ARB                 0x8B5B
+#define GL_FLOAT_MAT4_ARB                 0x8B5C
+#define GL_SAMPLER_1D_ARB                 0x8B5D
+#define GL_SAMPLER_2D_ARB                 0x8B5E
+#define GL_SAMPLER_3D_ARB                 0x8B5F
+#define GL_SAMPLER_CUBE_ARB               0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
+#define GL_SAMPLER_2D_RECT_ARB            0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB **string, const GLint *length);
+typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB obj);
+GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum pname);
+GLAPI void APIENTRY glDetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj);
+GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum shaderType);
+GLAPI void APIENTRY glShaderSourceARB (GLhandleARB shaderObj, GLsizei count, const GLcharARB **string, const GLint *length);
+GLAPI void APIENTRY glCompileShaderARB (GLhandleARB shaderObj);
+GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
+GLAPI void APIENTRY glAttachObjectARB (GLhandleARB containerObj, GLhandleARB obj);
+GLAPI void APIENTRY glLinkProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB programObj);
+GLAPI void APIENTRY glValidateProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUniform1fARB (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2fARB (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1iARB (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2iARB (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3iARB (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4iARB (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB obj, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB obj, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB programObj, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB programObj, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformivARB (GLhandleARB programObj, GLint location, GLint *params);
+GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif
+#endif /* GL_ARB_shader_objects */
+
+#ifndef GL_ARB_shader_precision
+#define GL_ARB_shader_precision 1
+#endif /* GL_ARB_shader_precision */
+
+#ifndef GL_ARB_shader_stencil_export
+#define GL_ARB_shader_stencil_export 1
+#endif /* GL_ARB_shader_stencil_export */
+
+#ifndef GL_ARB_shader_storage_buffer_object
+#define GL_ARB_shader_storage_buffer_object 1
+#endif /* GL_ARB_shader_storage_buffer_object */
+
+#ifndef GL_ARB_shader_subroutine
+#define GL_ARB_shader_subroutine 1
+#endif /* GL_ARB_shader_subroutine */
+
+#ifndef GL_ARB_shader_texture_image_samples
+#define GL_ARB_shader_texture_image_samples 1
+#endif /* GL_ARB_shader_texture_image_samples */
+
+#ifndef GL_ARB_shader_texture_lod
+#define GL_ARB_shader_texture_lod 1
+#endif /* GL_ARB_shader_texture_lod */
+
+#ifndef GL_ARB_shader_viewport_layer_array
+#define GL_ARB_shader_viewport_layer_array 1
+#endif /* GL_ARB_shader_viewport_layer_array */
+
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
+#endif /* GL_ARB_shading_language_100 */
+
+#ifndef GL_ARB_shading_language_420pack
+#define GL_ARB_shading_language_420pack 1
+#endif /* GL_ARB_shading_language_420pack */
+
+#ifndef GL_ARB_shading_language_include
+#define GL_ARB_shading_language_include 1
+#define GL_SHADER_INCLUDE_ARB             0x8DAE
+#define GL_NAMED_STRING_LENGTH_ARB        0x8DE9
+#define GL_NAMED_STRING_TYPE_ARB          0x8DEA
+typedef void (APIENTRYP PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar *const*path, const GLint *length);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glNamedStringARB (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+GLAPI void APIENTRY glDeleteNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glCompileShaderIncludeARB (GLuint shader, GLsizei count, const GLchar *const*path, const GLint *length);
+GLAPI GLboolean APIENTRY glIsNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glGetNamedStringARB (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+GLAPI void APIENTRY glGetNamedStringivARB (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ARB_shading_language_include */
+
+#ifndef GL_ARB_shading_language_packing
+#define GL_ARB_shading_language_packing 1
+#endif /* GL_ARB_shading_language_packing */
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
+#endif /* GL_ARB_shadow */
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+#endif /* GL_ARB_shadow_ambient */
+
+#ifndef GL_ARB_sparse_buffer
+#define GL_ARB_sparse_buffer 1
+#define GL_SPARSE_STORAGE_BIT_ARB         0x0400
+#define GL_SPARSE_BUFFER_PAGE_SIZE_ARB    0x82F8
+typedef void (APIENTRYP PFNGLBUFFERPAGECOMMITMENTARBPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLboolean commit);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERPAGECOMMITMENTEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERPAGECOMMITMENTARBPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferPageCommitmentARB (GLenum target, GLintptr offset, GLsizeiptr size, GLboolean commit);
+GLAPI void APIENTRY glNamedBufferPageCommitmentEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+GLAPI void APIENTRY glNamedBufferPageCommitmentARB (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+#endif
+#endif /* GL_ARB_sparse_buffer */
+
+#ifndef GL_ARB_sparse_texture
+#define GL_ARB_sparse_texture 1
+#define GL_TEXTURE_SPARSE_ARB             0x91A6
+#define GL_VIRTUAL_PAGE_SIZE_INDEX_ARB    0x91A7
+#define GL_NUM_SPARSE_LEVELS_ARB          0x91AA
+#define GL_NUM_VIRTUAL_PAGE_SIZES_ARB     0x91A8
+#define GL_VIRTUAL_PAGE_SIZE_X_ARB        0x9195
+#define GL_VIRTUAL_PAGE_SIZE_Y_ARB        0x9196
+#define GL_VIRTUAL_PAGE_SIZE_Z_ARB        0x9197
+#define GL_MAX_SPARSE_TEXTURE_SIZE_ARB    0x9198
+#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB 0x9199
+#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB 0x919A
+#define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB 0x91A9
+typedef void (APIENTRYP PFNGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+#endif
+#endif /* GL_ARB_sparse_texture */
+
+#ifndef GL_ARB_sparse_texture2
+#define GL_ARB_sparse_texture2 1
+#endif /* GL_ARB_sparse_texture2 */
+
+#ifndef GL_ARB_sparse_texture_clamp
+#define GL_ARB_sparse_texture_clamp 1
+#endif /* GL_ARB_sparse_texture_clamp */
+
+#ifndef GL_ARB_stencil_texturing
+#define GL_ARB_stencil_texturing 1
+#endif /* GL_ARB_stencil_texturing */
+
+#ifndef GL_ARB_sync
+#define GL_ARB_sync 1
+#endif /* GL_ARB_sync */
+
+#ifndef GL_ARB_tessellation_shader
+#define GL_ARB_tessellation_shader 1
+#endif /* GL_ARB_tessellation_shader */
+
+#ifndef GL_ARB_texture_barrier
+#define GL_ARB_texture_barrier 1
+#endif /* GL_ARB_texture_barrier */
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+#define GL_CLAMP_TO_BORDER_ARB            0x812D
+#endif /* GL_ARB_texture_border_clamp */
+
+#ifndef GL_ARB_texture_buffer_object
+#define GL_ARB_texture_buffer_object 1
+#define GL_TEXTURE_BUFFER_ARB             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_ARB     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_ARB      0x8C2E
+typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+#endif /* GL_ARB_texture_buffer_object */
+
+#ifndef GL_ARB_texture_buffer_object_rgb32
+#define GL_ARB_texture_buffer_object_rgb32 1
+#endif /* GL_ARB_texture_buffer_object_rgb32 */
+
+#ifndef GL_ARB_texture_buffer_range
+#define GL_ARB_texture_buffer_range 1
+#endif /* GL_ARB_texture_buffer_range */
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, void *img);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, void *img);
+#endif
+#endif /* GL_ARB_texture_compression */
+
+#ifndef GL_ARB_texture_compression_bptc
+#define GL_ARB_texture_compression_bptc 1
+#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F
+#endif /* GL_ARB_texture_compression_bptc */
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_ARB_texture_compression_rgtc 1
+#endif /* GL_ARB_texture_compression_rgtc */
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#endif /* GL_ARB_texture_cube_map */
+
+#ifndef GL_ARB_texture_cube_map_array
+#define GL_ARB_texture_cube_map_array 1
+#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB     0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB     0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F
+#endif /* GL_ARB_texture_cube_map_array */
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+#endif /* GL_ARB_texture_env_add */
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+#define GL_COMBINE_ARB                    0x8570
+#define GL_COMBINE_RGB_ARB                0x8571
+#define GL_COMBINE_ALPHA_ARB              0x8572
+#define GL_SOURCE0_RGB_ARB                0x8580
+#define GL_SOURCE1_RGB_ARB                0x8581
+#define GL_SOURCE2_RGB_ARB                0x8582
+#define GL_SOURCE0_ALPHA_ARB              0x8588
+#define GL_SOURCE1_ALPHA_ARB              0x8589
+#define GL_SOURCE2_ALPHA_ARB              0x858A
+#define GL_OPERAND0_RGB_ARB               0x8590
+#define GL_OPERAND1_RGB_ARB               0x8591
+#define GL_OPERAND2_RGB_ARB               0x8592
+#define GL_OPERAND0_ALPHA_ARB             0x8598
+#define GL_OPERAND1_ALPHA_ARB             0x8599
+#define GL_OPERAND2_ALPHA_ARB             0x859A
+#define GL_RGB_SCALE_ARB                  0x8573
+#define GL_ADD_SIGNED_ARB                 0x8574
+#define GL_INTERPOLATE_ARB                0x8575
+#define GL_SUBTRACT_ARB                   0x84E7
+#define GL_CONSTANT_ARB                   0x8576
+#define GL_PRIMARY_COLOR_ARB              0x8577
+#define GL_PREVIOUS_ARB                   0x8578
+#endif /* GL_ARB_texture_env_combine */
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+#endif /* GL_ARB_texture_env_crossbar */
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+#define GL_DOT3_RGB_ARB                   0x86AE
+#define GL_DOT3_RGBA_ARB                  0x86AF
+#endif /* GL_ARB_texture_env_dot3 */
+
+#ifndef GL_ARB_texture_filter_minmax
+#define GL_ARB_texture_filter_minmax 1
+#define GL_TEXTURE_REDUCTION_MODE_ARB     0x9366
+#define GL_WEIGHTED_AVERAGE_ARB           0x9367
+#endif /* GL_ARB_texture_filter_minmax */
+
+#ifndef GL_ARB_texture_float
+#define GL_ARB_texture_float 1
+#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
+#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
+#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
+#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
+#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
+#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
+#define GL_RGBA32F_ARB                    0x8814
+#define GL_RGB32F_ARB                     0x8815
+#define GL_ALPHA32F_ARB                   0x8816
+#define GL_INTENSITY32F_ARB               0x8817
+#define GL_LUMINANCE32F_ARB               0x8818
+#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
+#define GL_RGBA16F_ARB                    0x881A
+#define GL_RGB16F_ARB                     0x881B
+#define GL_ALPHA16F_ARB                   0x881C
+#define GL_INTENSITY16F_ARB               0x881D
+#define GL_LUMINANCE16F_ARB               0x881E
+#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
+#endif /* GL_ARB_texture_float */
+
+#ifndef GL_ARB_texture_gather
+#define GL_ARB_texture_gather 1
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F
+#endif /* GL_ARB_texture_gather */
+
+#ifndef GL_ARB_texture_mirror_clamp_to_edge
+#define GL_ARB_texture_mirror_clamp_to_edge 1
+#endif /* GL_ARB_texture_mirror_clamp_to_edge */
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+#define GL_MIRRORED_REPEAT_ARB            0x8370
+#endif /* GL_ARB_texture_mirrored_repeat */
+
+#ifndef GL_ARB_texture_multisample
+#define GL_ARB_texture_multisample 1
+#endif /* GL_ARB_texture_multisample */
+
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+#endif /* GL_ARB_texture_non_power_of_two */
+
+#ifndef GL_ARB_texture_query_levels
+#define GL_ARB_texture_query_levels 1
+#endif /* GL_ARB_texture_query_levels */
+
+#ifndef GL_ARB_texture_query_lod
+#define GL_ARB_texture_query_lod 1
+#endif /* GL_ARB_texture_query_lod */
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif /* GL_ARB_texture_rectangle */
+
+#ifndef GL_ARB_texture_rg
+#define GL_ARB_texture_rg 1
+#endif /* GL_ARB_texture_rg */
+
+#ifndef GL_ARB_texture_rgb10_a2ui
+#define GL_ARB_texture_rgb10_a2ui 1
+#endif /* GL_ARB_texture_rgb10_a2ui */
+
+#ifndef GL_ARB_texture_stencil8
+#define GL_ARB_texture_stencil8 1
+#endif /* GL_ARB_texture_stencil8 */
+
+#ifndef GL_ARB_texture_storage
+#define GL_ARB_texture_storage 1
+#endif /* GL_ARB_texture_storage */
+
+#ifndef GL_ARB_texture_storage_multisample
+#define GL_ARB_texture_storage_multisample 1
+#endif /* GL_ARB_texture_storage_multisample */
+
+#ifndef GL_ARB_texture_swizzle
+#define GL_ARB_texture_swizzle 1
+#endif /* GL_ARB_texture_swizzle */
+
+#ifndef GL_ARB_texture_view
+#define GL_ARB_texture_view 1
+#endif /* GL_ARB_texture_view */
+
+#ifndef GL_ARB_timer_query
+#define GL_ARB_timer_query 1
+#endif /* GL_ARB_timer_query */
+
+#ifndef GL_ARB_transform_feedback2
+#define GL_ARB_transform_feedback2 1
+#endif /* GL_ARB_transform_feedback2 */
+
+#ifndef GL_ARB_transform_feedback3
+#define GL_ARB_transform_feedback3 1
+#endif /* GL_ARB_transform_feedback3 */
+
+#ifndef GL_ARB_transform_feedback_instanced
+#define GL_ARB_transform_feedback_instanced 1
+#endif /* GL_ARB_transform_feedback_instanced */
+
+#ifndef GL_ARB_transform_feedback_overflow_query
+#define GL_ARB_transform_feedback_overflow_query 1
+#define GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB 0x82EC
+#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB 0x82ED
+#endif /* GL_ARB_transform_feedback_overflow_query */
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *m);
+#endif
+#endif /* GL_ARB_transpose_matrix */
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_ARB_uniform_buffer_object 1
+#endif /* GL_ARB_uniform_buffer_object */
+
+#ifndef GL_ARB_vertex_array_bgra
+#define GL_ARB_vertex_array_bgra 1
+#endif /* GL_ARB_vertex_array_bgra */
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_ARB_vertex_array_object 1
+#endif /* GL_ARB_vertex_array_object */
+
+#ifndef GL_ARB_vertex_attrib_64bit
+#define GL_ARB_vertex_attrib_64bit 1
+#endif /* GL_ARB_vertex_attrib_64bit */
+
+#ifndef GL_ARB_vertex_attrib_binding
+#define GL_ARB_vertex_attrib_binding 1
+#endif /* GL_ARB_vertex_attrib_binding */
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
+#define GL_VERTEX_BLEND_ARB               0x86A7
+#define GL_CURRENT_WEIGHT_ARB             0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
+#define GL_WEIGHT_ARRAY_ARB               0x86AD
+#define GL_MODELVIEW0_ARB                 0x1700
+#define GL_MODELVIEW1_ARB                 0x850A
+#define GL_MODELVIEW2_ARB                 0x8722
+#define GL_MODELVIEW3_ARB                 0x8723
+#define GL_MODELVIEW4_ARB                 0x8724
+#define GL_MODELVIEW5_ARB                 0x8725
+#define GL_MODELVIEW6_ARB                 0x8726
+#define GL_MODELVIEW7_ARB                 0x8727
+#define GL_MODELVIEW8_ARB                 0x8728
+#define GL_MODELVIEW9_ARB                 0x8729
+#define GL_MODELVIEW10_ARB                0x872A
+#define GL_MODELVIEW11_ARB                0x872B
+#define GL_MODELVIEW12_ARB                0x872C
+#define GL_MODELVIEW13_ARB                0x872D
+#define GL_MODELVIEW14_ARB                0x872E
+#define GL_MODELVIEW15_ARB                0x872F
+#define GL_MODELVIEW16_ARB                0x8730
+#define GL_MODELVIEW17_ARB                0x8731
+#define GL_MODELVIEW18_ARB                0x8732
+#define GL_MODELVIEW19_ARB                0x8733
+#define GL_MODELVIEW20_ARB                0x8734
+#define GL_MODELVIEW21_ARB                0x8735
+#define GL_MODELVIEW22_ARB                0x8736
+#define GL_MODELVIEW23_ARB                0x8737
+#define GL_MODELVIEW24_ARB                0x8738
+#define GL_MODELVIEW25_ARB                0x8739
+#define GL_MODELVIEW26_ARB                0x873A
+#define GL_MODELVIEW27_ARB                0x873B
+#define GL_MODELVIEW28_ARB                0x873C
+#define GL_MODELVIEW29_ARB                0x873D
+#define GL_MODELVIEW30_ARB                0x873E
+#define GL_MODELVIEW31_ARB                0x873F
+typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWeightbvARB (GLint size, const GLbyte *weights);
+GLAPI void APIENTRY glWeightsvARB (GLint size, const GLshort *weights);
+GLAPI void APIENTRY glWeightivARB (GLint size, const GLint *weights);
+GLAPI void APIENTRY glWeightfvARB (GLint size, const GLfloat *weights);
+GLAPI void APIENTRY glWeightdvARB (GLint size, const GLdouble *weights);
+GLAPI void APIENTRY glWeightubvARB (GLint size, const GLubyte *weights);
+GLAPI void APIENTRY glWeightusvARB (GLint size, const GLushort *weights);
+GLAPI void APIENTRY glWeightuivARB (GLint size, const GLuint *weights);
+GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glVertexBlendARB (GLint count);
+#endif
+#endif /* GL_ARB_vertex_blend */
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+typedef ptrdiff_t GLsizeiptrARB;
+typedef ptrdiff_t GLintptrARB;
+#define GL_BUFFER_SIZE_ARB                0x8764
+#define GL_BUFFER_USAGE_ARB               0x8765
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB                  0x88B8
+#define GL_WRITE_ONLY_ARB                 0x88B9
+#define GL_READ_WRITE_ARB                 0x88BA
+#define GL_BUFFER_ACCESS_ARB              0x88BB
+#define GL_BUFFER_MAPPED_ARB              0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
+#define GL_STREAM_DRAW_ARB                0x88E0
+#define GL_STREAM_READ_ARB                0x88E1
+#define GL_STREAM_COPY_ARB                0x88E2
+#define GL_STATIC_DRAW_ARB                0x88E4
+#define GL_STATIC_READ_ARB                0x88E5
+#define GL_STATIC_COPY_ARB                0x88E6
+#define GL_DYNAMIC_DRAW_ARB               0x88E8
+#define GL_DYNAMIC_READ_ARB               0x88E9
+#define GL_DYNAMIC_COPY_ARB               0x88EA
+typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data);
+typedef void *(APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindBufferARB (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffersARB (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffersARB (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBufferARB (GLuint buffer);
+GLAPI void APIENTRY glBufferDataARB (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data);
+GLAPI void APIENTRY glGetBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data);
+GLAPI void *APIENTRY glMapBufferARB (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum target);
+GLAPI void APIENTRY glGetBufferParameterivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointervARB (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_ARB_vertex_buffer_object */
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+#define GL_COLOR_SUM_ARB                  0x8458
+#define GL_VERTEX_PROGRAM_ARB             0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttrib1dARB (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fARB (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sARB (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dARB (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fARB (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sARB (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sARB (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4sARB (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointerARB (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivARB (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint index, GLenum pname, void **pointer);
+#endif
+#endif /* GL_ARB_vertex_program */
+
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+#define GL_VERTEX_SHADER_ARB              0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB programObj, const GLcharARB *name);
+#endif
+#endif /* GL_ARB_vertex_shader */
+
+#ifndef GL_ARB_vertex_type_10f_11f_11f_rev
+#define GL_ARB_vertex_type_10f_11f_11f_rev 1
+#endif /* GL_ARB_vertex_type_10f_11f_11f_rev */
+
+#ifndef GL_ARB_vertex_type_2_10_10_10_rev
+#define GL_ARB_vertex_type_2_10_10_10_rev 1
+#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
+
+#ifndef GL_ARB_viewport_array
+#define GL_ARB_viewport_array 1
+#endif /* GL_ARB_viewport_array */
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dARB (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fARB (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iARB (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sARB (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svARB (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dARB (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fARB (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iARB (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sARB (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svARB (const GLshort *v);
+#endif
+#endif /* GL_ARB_window_pos */
+
+#ifndef GL_KHR_blend_equation_advanced
+#define GL_KHR_blend_equation_advanced 1
+#define GL_MULTIPLY_KHR                   0x9294
+#define GL_SCREEN_KHR                     0x9295
+#define GL_OVERLAY_KHR                    0x9296
+#define GL_DARKEN_KHR                     0x9297
+#define GL_LIGHTEN_KHR                    0x9298
+#define GL_COLORDODGE_KHR                 0x9299
+#define GL_COLORBURN_KHR                  0x929A
+#define GL_HARDLIGHT_KHR                  0x929B
+#define GL_SOFTLIGHT_KHR                  0x929C
+#define GL_DIFFERENCE_KHR                 0x929E
+#define GL_EXCLUSION_KHR                  0x92A0
+#define GL_HSL_HUE_KHR                    0x92AD
+#define GL_HSL_SATURATION_KHR             0x92AE
+#define GL_HSL_COLOR_KHR                  0x92AF
+#define GL_HSL_LUMINOSITY_KHR             0x92B0
+typedef void (APIENTRYP PFNGLBLENDBARRIERKHRPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendBarrierKHR (void);
+#endif
+#endif /* GL_KHR_blend_equation_advanced */
+
+#ifndef GL_KHR_blend_equation_advanced_coherent
+#define GL_KHR_blend_equation_advanced_coherent 1
+#define GL_BLEND_ADVANCED_COHERENT_KHR    0x9285
+#endif /* GL_KHR_blend_equation_advanced_coherent */
+
+#ifndef GL_KHR_context_flush_control
+#define GL_KHR_context_flush_control 1
+#endif /* GL_KHR_context_flush_control */
+
+#ifndef GL_KHR_debug
+#define GL_KHR_debug 1
+#endif /* GL_KHR_debug */
+
+#ifndef GL_KHR_no_error
+#define GL_KHR_no_error 1
+#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR  0x00000008
+#endif /* GL_KHR_no_error */
+
+#ifndef GL_KHR_robust_buffer_access_behavior
+#define GL_KHR_robust_buffer_access_behavior 1
+#endif /* GL_KHR_robust_buffer_access_behavior */
+
+#ifndef GL_KHR_robustness
+#define GL_KHR_robustness 1
+#define GL_CONTEXT_ROBUST_ACCESS          0x90F3
+#endif /* GL_KHR_robustness */
+
+#ifndef GL_KHR_texture_compression_astc_hdr
+#define GL_KHR_texture_compression_astc_hdr 1
+#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR   0x93B0
+#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR   0x93B1
+#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR   0x93B2
+#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR   0x93B3
+#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR   0x93B4
+#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR   0x93B5
+#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR   0x93B6
+#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR   0x93B7
+#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR  0x93B8
+#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR  0x93B9
+#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR  0x93BA
+#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB
+#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC
+#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD
+#endif /* GL_KHR_texture_compression_astc_hdr */
+
+#ifndef GL_KHR_texture_compression_astc_ldr
+#define GL_KHR_texture_compression_astc_ldr 1
+#endif /* GL_KHR_texture_compression_astc_ldr */
+
+#ifndef GL_KHR_texture_compression_astc_sliced_3d
+#define GL_KHR_texture_compression_astc_sliced_3d 1
+#endif /* GL_KHR_texture_compression_astc_sliced_3d */
+
+#ifndef GL_OES_byte_coordinates
+#define GL_OES_byte_coordinates 1
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1BOESPROC) (GLenum texture, GLbyte s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2BOESPROC) (GLenum texture, GLbyte s, GLbyte t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD1BOESPROC) (GLbyte s);
+typedef void (APIENTRYP PFNGLTEXCOORD1BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD2BOESPROC) (GLbyte s, GLbyte t);
+typedef void (APIENTRYP PFNGLTEXCOORD2BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD3BOESPROC) (GLbyte s, GLbyte t, GLbyte r);
+typedef void (APIENTRYP PFNGLTEXCOORD3BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD4BOESPROC) (GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+typedef void (APIENTRYP PFNGLTEXCOORD4BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX2BOESPROC) (GLbyte x, GLbyte y);
+typedef void (APIENTRYP PFNGLVERTEX2BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX3BOESPROC) (GLbyte x, GLbyte y, GLbyte z);
+typedef void (APIENTRYP PFNGLVERTEX3BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX4BOESPROC) (GLbyte x, GLbyte y, GLbyte z, GLbyte w);
+typedef void (APIENTRYP PFNGLVERTEX4BVOESPROC) (const GLbyte *coords);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiTexCoord1bOES (GLenum texture, GLbyte s);
+GLAPI void APIENTRY glMultiTexCoord1bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord2bOES (GLenum texture, GLbyte s, GLbyte t);
+GLAPI void APIENTRY glMultiTexCoord2bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord3bOES (GLenum texture, GLbyte s, GLbyte t, GLbyte r);
+GLAPI void APIENTRY glMultiTexCoord3bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord4bOES (GLenum texture, GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+GLAPI void APIENTRY glMultiTexCoord4bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord1bOES (GLbyte s);
+GLAPI void APIENTRY glTexCoord1bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord2bOES (GLbyte s, GLbyte t);
+GLAPI void APIENTRY glTexCoord2bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord3bOES (GLbyte s, GLbyte t, GLbyte r);
+GLAPI void APIENTRY glTexCoord3bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord4bOES (GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+GLAPI void APIENTRY glTexCoord4bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex2bOES (GLbyte x, GLbyte y);
+GLAPI void APIENTRY glVertex2bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex3bOES (GLbyte x, GLbyte y, GLbyte z);
+GLAPI void APIENTRY glVertex3bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex4bOES (GLbyte x, GLbyte y, GLbyte z, GLbyte w);
+GLAPI void APIENTRY glVertex4bvOES (const GLbyte *coords);
+#endif
+#endif /* GL_OES_byte_coordinates */
+
+#ifndef GL_OES_compressed_paletted_texture
+#define GL_OES_compressed_paletted_texture 1
+#define GL_PALETTE4_RGB8_OES              0x8B90
+#define GL_PALETTE4_RGBA8_OES             0x8B91
+#define GL_PALETTE4_R5_G6_B5_OES          0x8B92
+#define GL_PALETTE4_RGBA4_OES             0x8B93
+#define GL_PALETTE4_RGB5_A1_OES           0x8B94
+#define GL_PALETTE8_RGB8_OES              0x8B95
+#define GL_PALETTE8_RGBA8_OES             0x8B96
+#define GL_PALETTE8_R5_G6_B5_OES          0x8B97
+#define GL_PALETTE8_RGBA4_OES             0x8B98
+#define GL_PALETTE8_RGB5_A1_OES           0x8B99
+#endif /* GL_OES_compressed_paletted_texture */
+
+#ifndef GL_OES_fixed_point
+#define GL_OES_fixed_point 1
+typedef GLint GLfixed;
+#define GL_FIXED_OES                      0x140C
+typedef void (APIENTRYP PFNGLALPHAFUNCXOESPROC) (GLenum func, GLfixed ref);
+typedef void (APIENTRYP PFNGLCLEARCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCLEARDEPTHXOESPROC) (GLfixed depth);
+typedef void (APIENTRYP PFNGLCLIPPLANEXOESPROC) (GLenum plane, const GLfixed *equation);
+typedef void (APIENTRYP PFNGLCOLOR4XOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLDEPTHRANGEXOESPROC) (GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLFOGXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLFOGXVOESPROC) (GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLFRUSTUMXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLGETCLIPPLANEXOESPROC) (GLenum plane, GLfixed *equation);
+typedef void (APIENTRYP PFNGLGETFIXEDVOESPROC) (GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXENVXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLLIGHTMODELXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLLIGHTMODELXVOESPROC) (GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLLIGHTXVOESPROC) (GLenum light, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLLINEWIDTHXOESPROC) (GLfixed width);
+typedef void (APIENTRYP PFNGLLOADMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLMATERIALXVOESPROC) (GLenum face, GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLMULTMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+typedef void (APIENTRYP PFNGLNORMAL3XOESPROC) (GLfixed nx, GLfixed ny, GLfixed nz);
+typedef void (APIENTRYP PFNGLORTHOXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERXVOESPROC) (GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLPOINTSIZEXOESPROC) (GLfixed size);
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETXOESPROC) (GLfixed factor, GLfixed units);
+typedef void (APIENTRYP PFNGLROTATEXOESPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLSCALEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLTEXENVXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXENVXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLTRANSLATEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLACCUMXOESPROC) (GLenum op, GLfixed value);
+typedef void (APIENTRYP PFNGLBITMAPXOESPROC) (GLsizei width, GLsizei height, GLfixed xorig, GLfixed yorig, GLfixed xmove, GLfixed ymove, const GLubyte *bitmap);
+typedef void (APIENTRYP PFNGLBLENDCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCLEARACCUMXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCOLOR3XOESPROC) (GLfixed red, GLfixed green, GLfixed blue);
+typedef void (APIENTRYP PFNGLCOLOR3XVOESPROC) (const GLfixed *components);
+typedef void (APIENTRYP PFNGLCOLOR4XVOESPROC) (const GLfixed *components);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLEVALCOORD1XOESPROC) (GLfixed u);
+typedef void (APIENTRYP PFNGLEVALCOORD1XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLEVALCOORD2XOESPROC) (GLfixed u, GLfixed v);
+typedef void (APIENTRYP PFNGLEVALCOORD2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLFEEDBACKBUFFERXOESPROC) (GLsizei n, GLenum type, const GLfixed *buffer);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETMAPXVOESPROC) (GLenum target, GLenum query, GLfixed *v);
+typedef void (APIENTRYP PFNGLGETMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLGETPIXELMAPXVPROC) (GLenum map, GLint size, GLfixed *values);
+typedef void (APIENTRYP PFNGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERXVOESPROC) (GLenum target, GLint level, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLINDEXXOESPROC) (GLfixed component);
+typedef void (APIENTRYP PFNGLINDEXXVOESPROC) (const GLfixed *component);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMAP1XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint stride, GLint order, GLfixed points);
+typedef void (APIENTRYP PFNGLMAP2XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint ustride, GLint uorder, GLfixed v1, GLfixed v2, GLint vstride, GLint vorder, GLfixed points);
+typedef void (APIENTRYP PFNGLMAPGRID1XOESPROC) (GLint n, GLfixed u1, GLfixed u2);
+typedef void (APIENTRYP PFNGLMAPGRID2XOESPROC) (GLint n, GLfixed u1, GLfixed u2, GLfixed v1, GLfixed v2);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1XOESPROC) (GLenum texture, GLfixed s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2XOESPROC) (GLenum texture, GLfixed s, GLfixed t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLNORMAL3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLPASSTHROUGHXOESPROC) (GLfixed token);
+typedef void (APIENTRYP PFNGLPIXELMAPXPROC) (GLenum map, GLint size, const GLfixed *values);
+typedef void (APIENTRYP PFNGLPIXELSTOREXPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFERXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLPIXELZOOMXOESPROC) (GLfixed xfactor, GLfixed yfactor);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESXOESPROC) (GLsizei n, const GLuint *textures, const GLfixed *priorities);
+typedef void (APIENTRYP PFNGLRASTERPOS2XOESPROC) (GLfixed x, GLfixed y);
+typedef void (APIENTRYP PFNGLRASTERPOS2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRASTERPOS3XOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLRASTERPOS3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRASTERPOS4XOESPROC) (GLfixed x, GLfixed y, GLfixed z, GLfixed w);
+typedef void (APIENTRYP PFNGLRASTERPOS4XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRECTXOESPROC) (GLfixed x1, GLfixed y1, GLfixed x2, GLfixed y2);
+typedef void (APIENTRYP PFNGLRECTXVOESPROC) (const GLfixed *v1, const GLfixed *v2);
+typedef void (APIENTRYP PFNGLTEXCOORD1XOESPROC) (GLfixed s);
+typedef void (APIENTRYP PFNGLTEXCOORD1XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD2XOESPROC) (GLfixed s, GLfixed t);
+typedef void (APIENTRYP PFNGLTEXCOORD2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD3XOESPROC) (GLfixed s, GLfixed t, GLfixed r);
+typedef void (APIENTRYP PFNGLTEXCOORD3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD4XOESPROC) (GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+typedef void (APIENTRYP PFNGLTEXCOORD4XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXGENXOESPROC) (GLenum coord, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXGENXVOESPROC) (GLenum coord, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLVERTEX2XOESPROC) (GLfixed x);
+typedef void (APIENTRYP PFNGLVERTEX2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLVERTEX3XOESPROC) (GLfixed x, GLfixed y);
+typedef void (APIENTRYP PFNGLVERTEX3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLVERTEX4XOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLVERTEX4XVOESPROC) (const GLfixed *coords);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAlphaFuncxOES (GLenum func, GLfixed ref);
+GLAPI void APIENTRY glClearColorxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glClearDepthxOES (GLfixed depth);
+GLAPI void APIENTRY glClipPlanexOES (GLenum plane, const GLfixed *equation);
+GLAPI void APIENTRY glColor4xOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glDepthRangexOES (GLfixed n, GLfixed f);
+GLAPI void APIENTRY glFogxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glFogxvOES (GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glFrustumxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+GLAPI void APIENTRY glGetClipPlanexOES (GLenum plane, GLfixed *equation);
+GLAPI void APIENTRY glGetFixedvOES (GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexEnvxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glLightModelxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glLightModelxvOES (GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glLightxOES (GLenum light, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glLightxvOES (GLenum light, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glLineWidthxOES (GLfixed width);
+GLAPI void APIENTRY glLoadMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMaterialxOES (GLenum face, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glMaterialxvOES (GLenum face, GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glMultMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMultiTexCoord4xOES (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+GLAPI void APIENTRY glNormal3xOES (GLfixed nx, GLfixed ny, GLfixed nz);
+GLAPI void APIENTRY glOrthoxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+GLAPI void APIENTRY glPointParameterxvOES (GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glPointSizexOES (GLfixed size);
+GLAPI void APIENTRY glPolygonOffsetxOES (GLfixed factor, GLfixed units);
+GLAPI void APIENTRY glRotatexOES (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glScalexOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glTexEnvxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexEnvxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glTexParameterxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexParameterxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glTranslatexOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glAccumxOES (GLenum op, GLfixed value);
+GLAPI void APIENTRY glBitmapxOES (GLsizei width, GLsizei height, GLfixed xorig, GLfixed yorig, GLfixed xmove, GLfixed ymove, const GLubyte *bitmap);
+GLAPI void APIENTRY glBlendColorxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glClearAccumxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glColor3xOES (GLfixed red, GLfixed green, GLfixed blue);
+GLAPI void APIENTRY glColor3xvOES (const GLfixed *components);
+GLAPI void APIENTRY glColor4xvOES (const GLfixed *components);
+GLAPI void APIENTRY glConvolutionParameterxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glConvolutionParameterxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glEvalCoord1xOES (GLfixed u);
+GLAPI void APIENTRY glEvalCoord1xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glEvalCoord2xOES (GLfixed u, GLfixed v);
+GLAPI void APIENTRY glEvalCoord2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glFeedbackBufferxOES (GLsizei n, GLenum type, const GLfixed *buffer);
+GLAPI void APIENTRY glGetConvolutionParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetHistogramParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetLightxOES (GLenum light, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetMapxvOES (GLenum target, GLenum query, GLfixed *v);
+GLAPI void APIENTRY glGetMaterialxOES (GLenum face, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glGetPixelMapxv (GLenum map, GLint size, GLfixed *values);
+GLAPI void APIENTRY glGetTexGenxvOES (GLenum coord, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexLevelParameterxvOES (GLenum target, GLint level, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glIndexxOES (GLfixed component);
+GLAPI void APIENTRY glIndexxvOES (const GLfixed *component);
+GLAPI void APIENTRY glLoadTransposeMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMap1xOES (GLenum target, GLfixed u1, GLfixed u2, GLint stride, GLint order, GLfixed points);
+GLAPI void APIENTRY glMap2xOES (GLenum target, GLfixed u1, GLfixed u2, GLint ustride, GLint uorder, GLfixed v1, GLfixed v2, GLint vstride, GLint vorder, GLfixed points);
+GLAPI void APIENTRY glMapGrid1xOES (GLint n, GLfixed u1, GLfixed u2);
+GLAPI void APIENTRY glMapGrid2xOES (GLint n, GLfixed u1, GLfixed u2, GLfixed v1, GLfixed v2);
+GLAPI void APIENTRY glMultTransposeMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMultiTexCoord1xOES (GLenum texture, GLfixed s);
+GLAPI void APIENTRY glMultiTexCoord1xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord2xOES (GLenum texture, GLfixed s, GLfixed t);
+GLAPI void APIENTRY glMultiTexCoord2xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord3xOES (GLenum texture, GLfixed s, GLfixed t, GLfixed r);
+GLAPI void APIENTRY glMultiTexCoord3xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord4xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glNormal3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glPassThroughxOES (GLfixed token);
+GLAPI void APIENTRY glPixelMapx (GLenum map, GLint size, const GLfixed *values);
+GLAPI void APIENTRY glPixelStorex (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glPixelTransferxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glPixelZoomxOES (GLfixed xfactor, GLfixed yfactor);
+GLAPI void APIENTRY glPrioritizeTexturesxOES (GLsizei n, const GLuint *textures, const GLfixed *priorities);
+GLAPI void APIENTRY glRasterPos2xOES (GLfixed x, GLfixed y);
+GLAPI void APIENTRY glRasterPos2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRasterPos3xOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glRasterPos3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRasterPos4xOES (GLfixed x, GLfixed y, GLfixed z, GLfixed w);
+GLAPI void APIENTRY glRasterPos4xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRectxOES (GLfixed x1, GLfixed y1, GLfixed x2, GLfixed y2);
+GLAPI void APIENTRY glRectxvOES (const GLfixed *v1, const GLfixed *v2);
+GLAPI void APIENTRY glTexCoord1xOES (GLfixed s);
+GLAPI void APIENTRY glTexCoord1xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord2xOES (GLfixed s, GLfixed t);
+GLAPI void APIENTRY glTexCoord2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord3xOES (GLfixed s, GLfixed t, GLfixed r);
+GLAPI void APIENTRY glTexCoord3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord4xOES (GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+GLAPI void APIENTRY glTexCoord4xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexGenxOES (GLenum coord, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexGenxvOES (GLenum coord, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glVertex2xOES (GLfixed x);
+GLAPI void APIENTRY glVertex2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glVertex3xOES (GLfixed x, GLfixed y);
+GLAPI void APIENTRY glVertex3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glVertex4xOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glVertex4xvOES (const GLfixed *coords);
+#endif
+#endif /* GL_OES_fixed_point */
+
+#ifndef GL_OES_query_matrix
+#define GL_OES_query_matrix 1
+typedef GLbitfield (APIENTRYP PFNGLQUERYMATRIXXOESPROC) (GLfixed *mantissa, GLint *exponent);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLbitfield APIENTRY glQueryMatrixxOES (GLfixed *mantissa, GLint *exponent);
+#endif
+#endif /* GL_OES_query_matrix */
+
+#ifndef GL_OES_read_format
+#define GL_OES_read_format 1
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
+#endif /* GL_OES_read_format */
+
+#ifndef GL_OES_single_precision
+#define GL_OES_single_precision 1
+typedef void (APIENTRYP PFNGLCLEARDEPTHFOESPROC) (GLclampf depth);
+typedef void (APIENTRYP PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat *equation);
+typedef void (APIENTRYP PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f);
+typedef void (APIENTRYP PFNGLFRUSTUMFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+typedef void (APIENTRYP PFNGLGETCLIPPLANEFOESPROC) (GLenum plane, GLfloat *equation);
+typedef void (APIENTRYP PFNGLORTHOFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClearDepthfOES (GLclampf depth);
+GLAPI void APIENTRY glClipPlanefOES (GLenum plane, const GLfloat *equation);
+GLAPI void APIENTRY glDepthRangefOES (GLclampf n, GLclampf f);
+GLAPI void APIENTRY glFrustumfOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+GLAPI void APIENTRY glGetClipPlanefOES (GLenum plane, GLfloat *equation);
+GLAPI void APIENTRY glOrthofOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+#endif
+#endif /* GL_OES_single_precision */
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#endif /* GL_3DFX_multisample */
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTbufferMask3DFX (GLuint mask);
+#endif
+#endif /* GL_3DFX_tbuffer */
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#endif /* GL_3DFX_texture_compression_FXT1 */
+
+#ifndef GL_AMD_blend_minmax_factor
+#define GL_AMD_blend_minmax_factor 1
+#define GL_FACTOR_MIN_AMD                 0x901C
+#define GL_FACTOR_MAX_AMD                 0x901D
+#endif /* GL_AMD_blend_minmax_factor */
+
+#ifndef GL_AMD_conservative_depth
+#define GL_AMD_conservative_depth 1
+#endif /* GL_AMD_conservative_depth */
+
+#ifndef GL_AMD_debug_output
+#define GL_AMD_debug_output 1
+typedef void (APIENTRY  *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam);
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_AMD   0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD  0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_AMD      0x9145
+#define GL_DEBUG_SEVERITY_HIGH_AMD        0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_AMD      0x9147
+#define GL_DEBUG_SEVERITY_LOW_AMD         0x9148
+#define GL_DEBUG_CATEGORY_API_ERROR_AMD   0x9149
+#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A
+#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B
+#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C
+#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D
+#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E
+#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F
+#define GL_DEBUG_CATEGORY_OTHER_AMD       0x9150
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+#endif
+#endif /* GL_AMD_debug_output */
+
+#ifndef GL_AMD_depth_clamp_separate
+#define GL_AMD_depth_clamp_separate 1
+#define GL_DEPTH_CLAMP_NEAR_AMD           0x901E
+#define GL_DEPTH_CLAMP_FAR_AMD            0x901F
+#endif /* GL_AMD_depth_clamp_separate */
+
+#ifndef GL_AMD_draw_buffers_blend
+#define GL_AMD_draw_buffers_blend 1
+typedef void (APIENTRYP PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncIndexedAMD (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparateIndexedAMD (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GLAPI void APIENTRY glBlendEquationIndexedAMD (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#endif
+#endif /* GL_AMD_draw_buffers_blend */
+
+#ifndef GL_AMD_gcn_shader
+#define GL_AMD_gcn_shader 1
+#endif /* GL_AMD_gcn_shader */
+
+#ifndef GL_AMD_gpu_shader_half_float
+#define GL_AMD_gpu_shader_half_float 1
+#define GL_FLOAT16_NV                     0x8FF8
+#define GL_FLOAT16_VEC2_NV                0x8FF9
+#define GL_FLOAT16_VEC3_NV                0x8FFA
+#define GL_FLOAT16_VEC4_NV                0x8FFB
+#define GL_FLOAT16_MAT2_AMD               0x91C5
+#define GL_FLOAT16_MAT3_AMD               0x91C6
+#define GL_FLOAT16_MAT4_AMD               0x91C7
+#define GL_FLOAT16_MAT2x3_AMD             0x91C8
+#define GL_FLOAT16_MAT2x4_AMD             0x91C9
+#define GL_FLOAT16_MAT3x2_AMD             0x91CA
+#define GL_FLOAT16_MAT3x4_AMD             0x91CB
+#define GL_FLOAT16_MAT4x2_AMD             0x91CC
+#define GL_FLOAT16_MAT4x3_AMD             0x91CD
+#endif /* GL_AMD_gpu_shader_half_float */
+
+#ifndef GL_AMD_gpu_shader_int64
+#define GL_AMD_gpu_shader_int64 1
+typedef int64_t GLint64EXT;
+#define GL_INT64_NV                       0x140E
+#define GL_UNSIGNED_INT64_NV              0x140F
+#define GL_INT8_NV                        0x8FE0
+#define GL_INT8_VEC2_NV                   0x8FE1
+#define GL_INT8_VEC3_NV                   0x8FE2
+#define GL_INT8_VEC4_NV                   0x8FE3
+#define GL_INT16_NV                       0x8FE4
+#define GL_INT16_VEC2_NV                  0x8FE5
+#define GL_INT16_VEC3_NV                  0x8FE6
+#define GL_INT16_VEC4_NV                  0x8FE7
+#define GL_INT64_VEC2_NV                  0x8FE9
+#define GL_INT64_VEC3_NV                  0x8FEA
+#define GL_INT64_VEC4_NV                  0x8FEB
+#define GL_UNSIGNED_INT8_NV               0x8FEC
+#define GL_UNSIGNED_INT8_VEC2_NV          0x8FED
+#define GL_UNSIGNED_INT8_VEC3_NV          0x8FEE
+#define GL_UNSIGNED_INT8_VEC4_NV          0x8FEF
+#define GL_UNSIGNED_INT16_NV              0x8FF0
+#define GL_UNSIGNED_INT16_VEC2_NV         0x8FF1
+#define GL_UNSIGNED_INT16_VEC3_NV         0x8FF2
+#define GL_UNSIGNED_INT16_VEC4_NV         0x8FF3
+#define GL_UNSIGNED_INT64_VEC2_NV         0x8FF5
+#define GL_UNSIGNED_INT64_VEC3_NV         0x8FF6
+#define GL_UNSIGNED_INT64_VEC4_NV         0x8FF7
+typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x);
+typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x);
+GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x);
+GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params);
+GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params);
+GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x);
+GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x);
+GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif
+#endif /* GL_AMD_gpu_shader_int64 */
+
+#ifndef GL_AMD_interleaved_elements
+#define GL_AMD_interleaved_elements 1
+#define GL_VERTEX_ELEMENT_SWIZZLE_AMD     0x91A4
+#define GL_VERTEX_ID_SWIZZLE_AMD          0x91A5
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPARAMETERIAMDPROC) (GLuint index, GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribParameteriAMD (GLuint index, GLenum pname, GLint param);
+#endif
+#endif /* GL_AMD_interleaved_elements */
+
+#ifndef GL_AMD_multi_draw_indirect
+#define GL_AMD_multi_draw_indirect 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC) (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectAMD (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirectAMD (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride);
+#endif
+#endif /* GL_AMD_multi_draw_indirect */
+
+#ifndef GL_AMD_name_gen_delete
+#define GL_AMD_name_gen_delete 1
+#define GL_DATA_BUFFER_AMD                0x9151
+#define GL_PERFORMANCE_MONITOR_AMD        0x9152
+#define GL_QUERY_OBJECT_AMD               0x9153
+#define GL_VERTEX_ARRAY_OBJECT_AMD        0x9154
+#define GL_SAMPLER_OBJECT_AMD             0x9155
+typedef void (APIENTRYP PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint *names);
+typedef void (APIENTRYP PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint *names);
+typedef GLboolean (APIENTRYP PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenNamesAMD (GLenum identifier, GLuint num, GLuint *names);
+GLAPI void APIENTRY glDeleteNamesAMD (GLenum identifier, GLuint num, const GLuint *names);
+GLAPI GLboolean APIENTRY glIsNameAMD (GLenum identifier, GLuint name);
+#endif
+#endif /* GL_AMD_name_gen_delete */
+
+#ifndef GL_AMD_occlusion_query_event
+#define GL_AMD_occlusion_query_event 1
+#define GL_OCCLUSION_QUERY_EVENT_MASK_AMD 0x874F
+#define GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD 0x00000001
+#define GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD 0x00000002
+#define GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD 0x00000004
+#define GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD 0x00000008
+#define GL_QUERY_ALL_EVENT_BITS_AMD       0xFFFFFFFF
+typedef void (APIENTRYP PFNGLQUERYOBJECTPARAMETERUIAMDPROC) (GLenum target, GLuint id, GLenum pname, GLuint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glQueryObjectParameteruiAMD (GLenum target, GLuint id, GLenum pname, GLuint param);
+#endif
+#endif /* GL_AMD_occlusion_query_event */
+
+#ifndef GL_AMD_performance_monitor
+#define GL_AMD_performance_monitor 1
+#define GL_COUNTER_TYPE_AMD               0x8BC0
+#define GL_COUNTER_RANGE_AMD              0x8BC1
+#define GL_UNSIGNED_INT64_AMD             0x8BC2
+#define GL_PERCENTAGE_AMD                 0x8BC3
+#define GL_PERFMON_RESULT_AVAILABLE_AMD   0x8BC4
+#define GL_PERFMON_RESULT_SIZE_AMD        0x8BC5
+#define GL_PERFMON_RESULT_AMD             0x8BC6
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data);
+typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, void *data);
+GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif
+#endif /* GL_AMD_performance_monitor */
+
+#ifndef GL_AMD_pinned_memory
+#define GL_AMD_pinned_memory 1
+#define GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD 0x9160
+#endif /* GL_AMD_pinned_memory */
+
+#ifndef GL_AMD_query_buffer_object
+#define GL_AMD_query_buffer_object 1
+#define GL_QUERY_BUFFER_AMD               0x9192
+#define GL_QUERY_BUFFER_BINDING_AMD       0x9193
+#define GL_QUERY_RESULT_NO_WAIT_AMD       0x9194
+#endif /* GL_AMD_query_buffer_object */
+
+#ifndef GL_AMD_sample_positions
+#define GL_AMD_sample_positions 1
+#define GL_SUBSAMPLE_DISTANCE_AMD         0x883F
+typedef void (APIENTRYP PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat *val);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLfloat *val);
+#endif
+#endif /* GL_AMD_sample_positions */
+
+#ifndef GL_AMD_seamless_cubemap_per_texture
+#define GL_AMD_seamless_cubemap_per_texture 1
+#endif /* GL_AMD_seamless_cubemap_per_texture */
+
+#ifndef GL_AMD_shader_atomic_counter_ops
+#define GL_AMD_shader_atomic_counter_ops 1
+#endif /* GL_AMD_shader_atomic_counter_ops */
+
+#ifndef GL_AMD_shader_ballot
+#define GL_AMD_shader_ballot 1
+#endif /* GL_AMD_shader_ballot */
+
+#ifndef GL_AMD_shader_explicit_vertex_parameter
+#define GL_AMD_shader_explicit_vertex_parameter 1
+#endif /* GL_AMD_shader_explicit_vertex_parameter */
+
+#ifndef GL_AMD_shader_stencil_export
+#define GL_AMD_shader_stencil_export 1
+#endif /* GL_AMD_shader_stencil_export */
+
+#ifndef GL_AMD_shader_trinary_minmax
+#define GL_AMD_shader_trinary_minmax 1
+#endif /* GL_AMD_shader_trinary_minmax */
+
+#ifndef GL_AMD_sparse_texture
+#define GL_AMD_sparse_texture 1
+#define GL_VIRTUAL_PAGE_SIZE_X_AMD        0x9195
+#define GL_VIRTUAL_PAGE_SIZE_Y_AMD        0x9196
+#define GL_VIRTUAL_PAGE_SIZE_Z_AMD        0x9197
+#define GL_MAX_SPARSE_TEXTURE_SIZE_AMD    0x9198
+#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD 0x9199
+#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS 0x919A
+#define GL_MIN_SPARSE_LEVEL_AMD           0x919B
+#define GL_MIN_LOD_WARNING_AMD            0x919C
+#define GL_TEXTURE_STORAGE_SPARSE_BIT_AMD 0x00000001
+typedef void (APIENTRYP PFNGLTEXSTORAGESPARSEAMDPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGESPARSEAMDPROC) (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexStorageSparseAMD (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+GLAPI void APIENTRY glTextureStorageSparseAMD (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+#endif
+#endif /* GL_AMD_sparse_texture */
+
+#ifndef GL_AMD_stencil_operation_extended
+#define GL_AMD_stencil_operation_extended 1
+#define GL_SET_AMD                        0x874A
+#define GL_REPLACE_VALUE_AMD              0x874B
+#define GL_STENCIL_OP_VALUE_AMD           0x874C
+#define GL_STENCIL_BACK_OP_VALUE_AMD      0x874D
+typedef void (APIENTRYP PFNGLSTENCILOPVALUEAMDPROC) (GLenum face, GLuint value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpValueAMD (GLenum face, GLuint value);
+#endif
+#endif /* GL_AMD_stencil_operation_extended */
+
+#ifndef GL_AMD_texture_texture4
+#define GL_AMD_texture_texture4 1
+#endif /* GL_AMD_texture_texture4 */
+
+#ifndef GL_AMD_transform_feedback3_lines_triangles
+#define GL_AMD_transform_feedback3_lines_triangles 1
+#endif /* GL_AMD_transform_feedback3_lines_triangles */
+
+#ifndef GL_AMD_transform_feedback4
+#define GL_AMD_transform_feedback4 1
+#define GL_STREAM_RASTERIZATION_AMD       0x91A0
+#endif /* GL_AMD_transform_feedback4 */
+
+#ifndef GL_AMD_vertex_shader_layer
+#define GL_AMD_vertex_shader_layer 1
+#endif /* GL_AMD_vertex_shader_layer */
+
+#ifndef GL_AMD_vertex_shader_tessellator
+#define GL_AMD_vertex_shader_tessellator 1
+#define GL_SAMPLER_BUFFER_AMD             0x9001
+#define GL_INT_SAMPLER_BUFFER_AMD         0x9002
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003
+#define GL_TESSELLATION_MODE_AMD          0x9004
+#define GL_TESSELLATION_FACTOR_AMD        0x9005
+#define GL_DISCRETE_AMD                   0x9006
+#define GL_CONTINUOUS_AMD                 0x9007
+typedef void (APIENTRYP PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTessellationFactorAMD (GLfloat factor);
+GLAPI void APIENTRY glTessellationModeAMD (GLenum mode);
+#endif
+#endif /* GL_AMD_vertex_shader_tessellator */
+
+#ifndef GL_AMD_vertex_shader_viewport_index
+#define GL_AMD_vertex_shader_viewport_index 1
+#endif /* GL_AMD_vertex_shader_viewport_index */
+
+#ifndef GL_APPLE_aux_depth_stencil
+#define GL_APPLE_aux_depth_stencil 1
+#define GL_AUX_DEPTH_STENCIL_APPLE        0x8A14
+#endif /* GL_APPLE_aux_depth_stencil */
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
+#endif /* GL_APPLE_client_storage */
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+#define GL_ELEMENT_ARRAY_APPLE            0x8A0C
+#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8A0D
+#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x8A0E
+typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerAPPLE (GLenum type, const void *pointer);
+GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif
+#endif /* GL_APPLE_element_array */
+
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+#define GL_DRAW_PIXELS_APPLE              0x8A0A
+#define GL_FENCE_APPLE                    0x8A0B
+typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
+typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenFencesAPPLE (GLsizei n, GLuint *fences);
+GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glSetFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint fence);
+GLAPI void APIENTRY glFinishFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum object, GLuint name);
+GLAPI void APIENTRY glFinishObjectAPPLE (GLenum object, GLint name);
+#endif
+#endif /* GL_APPLE_fence */
+
+#ifndef GL_APPLE_float_pixels
+#define GL_APPLE_float_pixels 1
+#define GL_HALF_APPLE                     0x140B
+#define GL_RGBA_FLOAT32_APPLE             0x8814
+#define GL_RGB_FLOAT32_APPLE              0x8815
+#define GL_ALPHA_FLOAT32_APPLE            0x8816
+#define GL_INTENSITY_FLOAT32_APPLE        0x8817
+#define GL_LUMINANCE_FLOAT32_APPLE        0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE  0x8819
+#define GL_RGBA_FLOAT16_APPLE             0x881A
+#define GL_RGB_FLOAT16_APPLE              0x881B
+#define GL_ALPHA_FLOAT16_APPLE            0x881C
+#define GL_INTENSITY_FLOAT16_APPLE        0x881D
+#define GL_LUMINANCE_FLOAT16_APPLE        0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE  0x881F
+#define GL_COLOR_FLOAT_APPLE              0x8A0F
+#endif /* GL_APPLE_float_pixels */
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_APPLE_flush_buffer_range 1
+#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
+#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
+typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum target, GLintptr offset, GLsizeiptr size);
+#endif
+#endif /* GL_APPLE_flush_buffer_range */
+
+#ifndef GL_APPLE_object_purgeable
+#define GL_APPLE_object_purgeable 1
+#define GL_BUFFER_OBJECT_APPLE            0x85B3
+#define GL_RELEASED_APPLE                 0x8A19
+#define GL_VOLATILE_APPLE                 0x8A1A
+#define GL_RETAINED_APPLE                 0x8A1B
+#define GL_UNDEFINED_APPLE                0x8A1C
+#define GL_PURGEABLE_APPLE                0x8A1D
+typedef GLenum (APIENTRYP PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef GLenum (APIENTRYP PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLenum APIENTRY glObjectPurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI GLenum APIENTRY glObjectUnpurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI void APIENTRY glGetObjectParameterivAPPLE (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#endif
+#endif /* GL_APPLE_object_purgeable */
+
+#ifndef GL_APPLE_rgb_422
+#define GL_APPLE_rgb_422 1
+#define GL_RGB_422_APPLE                  0x8A1F
+#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
+#define GL_RGB_RAW_422_APPLE              0x8A51
+#endif /* GL_APPLE_rgb_422 */
+
+#ifndef GL_APPLE_row_bytes
+#define GL_APPLE_row_bytes 1
+#define GL_PACK_ROW_BYTES_APPLE           0x8A15
+#define GL_UNPACK_ROW_BYTES_APPLE         0x8A16
+#endif /* GL_APPLE_row_bytes */
+
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#endif /* GL_APPLE_specular_vector */
+
+#ifndef GL_APPLE_texture_range
+#define GL_APPLE_texture_range 1
+#define GL_TEXTURE_RANGE_LENGTH_APPLE     0x85B7
+#define GL_TEXTURE_RANGE_POINTER_APPLE    0x85B8
+#define GL_TEXTURE_STORAGE_HINT_APPLE     0x85BC
+#define GL_STORAGE_PRIVATE_APPLE          0x85BD
+#define GL_STORAGE_CACHED_APPLE           0x85BE
+#define GL_STORAGE_SHARED_APPLE           0x85BF
+typedef void (APIENTRYP PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, const void *pointer);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureRangeAPPLE (GLenum target, GLsizei length, const void *pointer);
+GLAPI void APIENTRY glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_APPLE_texture_range */
+
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#endif /* GL_APPLE_transform_hint */
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint array);
+#endif
+#endif /* GL_APPLE_vertex_array_object */
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CLIENT_APPLE           0x85B4
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer);
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei length, void *pointer);
+GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei length, void *pointer);
+GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum pname, GLint param);
+#endif
+#endif /* GL_APPLE_vertex_array_range */
+
+#ifndef GL_APPLE_vertex_program_evaluators
+#define GL_APPLE_vertex_program_evaluators 1
+#define GL_VERTEX_ATTRIB_MAP1_APPLE       0x8A00
+#define GL_VERTEX_ATTRIB_MAP2_APPLE       0x8A01
+#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE  0x8A02
+#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03
+#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04
+#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05
+#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE  0x8A06
+#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07
+#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08
+#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glEnableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glDisableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI GLboolean APIENTRY glIsVertexAttribEnabledAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glMapVertexAttrib1dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib1fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+GLAPI void APIENTRY glMapVertexAttrib2dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib2fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#endif
+#endif /* GL_APPLE_vertex_program_evaluators */
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+#define GL_YCBCR_422_APPLE                0x85B9
+#endif /* GL_APPLE_ycbcr_422 */
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
+#define GL_DRAW_BUFFER0_ATI               0x8825
+#define GL_DRAW_BUFFER1_ATI               0x8826
+#define GL_DRAW_BUFFER2_ATI               0x8827
+#define GL_DRAW_BUFFER3_ATI               0x8828
+#define GL_DRAW_BUFFER4_ATI               0x8829
+#define GL_DRAW_BUFFER5_ATI               0x882A
+#define GL_DRAW_BUFFER6_ATI               0x882B
+#define GL_DRAW_BUFFER7_ATI               0x882C
+#define GL_DRAW_BUFFER8_ATI               0x882D
+#define GL_DRAW_BUFFER9_ATI               0x882E
+#define GL_DRAW_BUFFER10_ATI              0x882F
+#define GL_DRAW_BUFFER11_ATI              0x8830
+#define GL_DRAW_BUFFER12_ATI              0x8831
+#define GL_DRAW_BUFFER13_ATI              0x8832
+#define GL_DRAW_BUFFER14_ATI              0x8833
+#define GL_DRAW_BUFFER15_ATI              0x8834
+typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersATI (GLsizei n, const GLenum *bufs);
+#endif
+#endif /* GL_ATI_draw_buffers */
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+#define GL_ELEMENT_ARRAY_ATI              0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
+typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerATI (GLenum type, const void *pointer);
+GLAPI void APIENTRY glDrawElementArrayATI (GLenum mode, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif
+#endif /* GL_ATI_element_array */
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+#define GL_BUMP_ROT_MATRIX_ATI            0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
+#define GL_BUMP_TEX_UNITS_ATI             0x8778
+#define GL_DUDV_ATI                       0x8779
+#define GL_DU8DV8_ATI                     0x877A
+#define GL_BUMP_ENVMAP_ATI                0x877B
+#define GL_BUMP_TARGET_ATI                0x877C
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBumpParameterivATI (GLenum pname, const GLint *param);
+GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum pname, GLfloat *param);
+#endif
+#endif /* GL_ATI_envmap_bumpmap */
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+#define GL_FRAGMENT_SHADER_ATI            0x8920
+#define GL_REG_0_ATI                      0x8921
+#define GL_REG_1_ATI                      0x8922
+#define GL_REG_2_ATI                      0x8923
+#define GL_REG_3_ATI                      0x8924
+#define GL_REG_4_ATI                      0x8925
+#define GL_REG_5_ATI                      0x8926
+#define GL_REG_6_ATI                      0x8927
+#define GL_REG_7_ATI                      0x8928
+#define GL_REG_8_ATI                      0x8929
+#define GL_REG_9_ATI                      0x892A
+#define GL_REG_10_ATI                     0x892B
+#define GL_REG_11_ATI                     0x892C
+#define GL_REG_12_ATI                     0x892D
+#define GL_REG_13_ATI                     0x892E
+#define GL_REG_14_ATI                     0x892F
+#define GL_REG_15_ATI                     0x8930
+#define GL_REG_16_ATI                     0x8931
+#define GL_REG_17_ATI                     0x8932
+#define GL_REG_18_ATI                     0x8933
+#define GL_REG_19_ATI                     0x8934
+#define GL_REG_20_ATI                     0x8935
+#define GL_REG_21_ATI                     0x8936
+#define GL_REG_22_ATI                     0x8937
+#define GL_REG_23_ATI                     0x8938
+#define GL_REG_24_ATI                     0x8939
+#define GL_REG_25_ATI                     0x893A
+#define GL_REG_26_ATI                     0x893B
+#define GL_REG_27_ATI                     0x893C
+#define GL_REG_28_ATI                     0x893D
+#define GL_REG_29_ATI                     0x893E
+#define GL_REG_30_ATI                     0x893F
+#define GL_REG_31_ATI                     0x8940
+#define GL_CON_0_ATI                      0x8941
+#define GL_CON_1_ATI                      0x8942
+#define GL_CON_2_ATI                      0x8943
+#define GL_CON_3_ATI                      0x8944
+#define GL_CON_4_ATI                      0x8945
+#define GL_CON_5_ATI                      0x8946
+#define GL_CON_6_ATI                      0x8947
+#define GL_CON_7_ATI                      0x8948
+#define GL_CON_8_ATI                      0x8949
+#define GL_CON_9_ATI                      0x894A
+#define GL_CON_10_ATI                     0x894B
+#define GL_CON_11_ATI                     0x894C
+#define GL_CON_12_ATI                     0x894D
+#define GL_CON_13_ATI                     0x894E
+#define GL_CON_14_ATI                     0x894F
+#define GL_CON_15_ATI                     0x8950
+#define GL_CON_16_ATI                     0x8951
+#define GL_CON_17_ATI                     0x8952
+#define GL_CON_18_ATI                     0x8953
+#define GL_CON_19_ATI                     0x8954
+#define GL_CON_20_ATI                     0x8955
+#define GL_CON_21_ATI                     0x8956
+#define GL_CON_22_ATI                     0x8957
+#define GL_CON_23_ATI                     0x8958
+#define GL_CON_24_ATI                     0x8959
+#define GL_CON_25_ATI                     0x895A
+#define GL_CON_26_ATI                     0x895B
+#define GL_CON_27_ATI                     0x895C
+#define GL_CON_28_ATI                     0x895D
+#define GL_CON_29_ATI                     0x895E
+#define GL_CON_30_ATI                     0x895F
+#define GL_CON_31_ATI                     0x8960
+#define GL_MOV_ATI                        0x8961
+#define GL_ADD_ATI                        0x8963
+#define GL_MUL_ATI                        0x8964
+#define GL_SUB_ATI                        0x8965
+#define GL_DOT3_ATI                       0x8966
+#define GL_DOT4_ATI                       0x8967
+#define GL_MAD_ATI                        0x8968
+#define GL_LERP_ATI                       0x8969
+#define GL_CND_ATI                        0x896A
+#define GL_CND0_ATI                       0x896B
+#define GL_DOT2_ADD_ATI                   0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
+#define GL_NUM_PASSES_ATI                 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
+#define GL_SWIZZLE_STR_ATI                0x8976
+#define GL_SWIZZLE_STQ_ATI                0x8977
+#define GL_SWIZZLE_STR_DR_ATI             0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
+#define GL_SWIZZLE_STRQ_ATI               0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
+#define GL_RED_BIT_ATI                    0x00000001
+#define GL_GREEN_BIT_ATI                  0x00000002
+#define GL_BLUE_BIT_ATI                   0x00000004
+#define GL_2X_BIT_ATI                     0x00000001
+#define GL_4X_BIT_ATI                     0x00000002
+#define GL_8X_BIT_ATI                     0x00000004
+#define GL_HALF_BIT_ATI                   0x00000008
+#define GL_QUARTER_BIT_ATI                0x00000010
+#define GL_EIGHTH_BIT_ATI                 0x00000020
+#define GL_SATURATE_BIT_ATI               0x00000040
+#define GL_COMP_BIT_ATI                   0x00000002
+#define GL_NEGATE_BIT_ATI                 0x00000004
+#define GL_BIAS_BIT_ATI                   0x00000008
+typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint range);
+GLAPI void APIENTRY glBindFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glBeginFragmentShaderATI (void);
+GLAPI void APIENTRY glEndFragmentShaderATI (void);
+GLAPI void APIENTRY glPassTexCoordATI (GLuint dst, GLuint coord, GLenum swizzle);
+GLAPI void APIENTRY glSampleMapATI (GLuint dst, GLuint interp, GLenum swizzle);
+GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint dst, const GLfloat *value);
+#endif
+#endif /* GL_ATI_fragment_shader */
+
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+typedef void *(APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void *APIENTRY glMapObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint buffer);
+#endif
+#endif /* GL_ATI_map_object_buffer */
+
+#ifndef GL_ATI_meminfo
+#define GL_ATI_meminfo 1
+#define GL_VBO_FREE_MEMORY_ATI            0x87FB
+#define GL_TEXTURE_FREE_MEMORY_ATI        0x87FC
+#define GL_RENDERBUFFER_FREE_MEMORY_ATI   0x87FD
+#endif /* GL_ATI_meminfo */
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_ATI_pixel_format_float 1
+#define GL_RGBA_FLOAT_MODE_ATI            0x8820
+#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+#endif /* GL_ATI_pixel_format_float */
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+#define GL_PN_TRIANGLES_ATI               0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPNTrianglesiATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glPNTrianglesfATI (GLenum pname, GLfloat param);
+#endif
+#endif /* GL_ATI_pn_triangles */
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+#define GL_STENCIL_BACK_FUNC_ATI          0x8800
+#define GL_STENCIL_BACK_FAIL_ATI          0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpSeparateATI (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif
+#endif /* GL_ATI_separate_stencil */
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
+#endif /* GL_ATI_text_fragment_shader */
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+#define GL_MODULATE_ADD_ATI               0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
+#define GL_MODULATE_SUBTRACT_ATI          0x8746
+#endif /* GL_ATI_texture_env_combine3 */
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+#define GL_RGBA_FLOAT32_ATI               0x8814
+#define GL_RGB_FLOAT32_ATI                0x8815
+#define GL_ALPHA_FLOAT32_ATI              0x8816
+#define GL_INTENSITY_FLOAT32_ATI          0x8817
+#define GL_LUMINANCE_FLOAT32_ATI          0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
+#define GL_RGBA_FLOAT16_ATI               0x881A
+#define GL_RGB_FLOAT16_ATI                0x881B
+#define GL_ALPHA_FLOAT16_ATI              0x881C
+#define GL_INTENSITY_FLOAT16_ATI          0x881D
+#define GL_LUMINANCE_FLOAT16_ATI          0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
+#endif /* GL_ATI_texture_float */
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+#define GL_MIRROR_CLAMP_ATI               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
+#endif /* GL_ATI_texture_mirror_once */
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+#define GL_STATIC_ATI                     0x8760
+#define GL_DYNAMIC_ATI                    0x8761
+#define GL_PRESERVE_ATI                   0x8762
+#define GL_DISCARD_ATI                    0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
+typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const void *pointer, GLenum usage);
+typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const void *pointer, GLenum preserve);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei size, const void *pointer, GLenum usage);
+GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint buffer, GLuint offset, GLsizei size, const void *pointer, GLenum preserve);
+GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint buffer, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectBufferivATI (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFreeObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glArrayObjectATI (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum array, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetArrayObjectivATI (GLenum array, GLenum pname, GLint *params);
+GLAPI void APIENTRY glVariantArrayObjectATI (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint id, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint id, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ATI_vertex_array_object */
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint index, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ATI_vertex_attrib_array_object */
+
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
+#define GL_VERTEX_STREAM0_ATI             0x876C
+#define GL_VERTEX_STREAM1_ATI             0x876D
+#define GL_VERTEX_STREAM2_ATI             0x876E
+#define GL_VERTEX_STREAM3_ATI             0x876F
+#define GL_VERTEX_STREAM4_ATI             0x8770
+#define GL_VERTEX_STREAM5_ATI             0x8771
+#define GL_VERTEX_STREAM6_ATI             0x8772
+#define GL_VERTEX_STREAM7_ATI             0x8773
+#define GL_VERTEX_SOURCE_ATI              0x8774
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexStream1sATI (GLenum stream, GLshort x);
+GLAPI void APIENTRY glVertexStream1svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream1iATI (GLenum stream, GLint x);
+GLAPI void APIENTRY glVertexStream1ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream1fATI (GLenum stream, GLfloat x);
+GLAPI void APIENTRY glVertexStream1fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream1dATI (GLenum stream, GLdouble x);
+GLAPI void APIENTRY glVertexStream1dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream2sATI (GLenum stream, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexStream2svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream2iATI (GLenum stream, GLint x, GLint y);
+GLAPI void APIENTRY glVertexStream2ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream2fATI (GLenum stream, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexStream2fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream2dATI (GLenum stream, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexStream2dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream3sATI (GLenum stream, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream3iATI (GLenum stream, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream3fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream3dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream4sATI (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexStream4svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream4iATI (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexStream4ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream4fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexStream4fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream4dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexStream4dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glNormalStream3bATI (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+GLAPI void APIENTRY glNormalStream3bvATI (GLenum stream, const GLbyte *coords);
+GLAPI void APIENTRY glNormalStream3sATI (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+GLAPI void APIENTRY glNormalStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glNormalStream3iATI (GLenum stream, GLint nx, GLint ny, GLint nz);
+GLAPI void APIENTRY glNormalStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glNormalStream3fATI (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+GLAPI void APIENTRY glNormalStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glNormalStream3dATI (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+GLAPI void APIENTRY glNormalStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum stream);
+GLAPI void APIENTRY glVertexBlendEnviATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param);
+#endif
+#endif /* GL_ATI_vertex_streams */
+
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#endif /* GL_EXT_422_pixels */
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+#define GL_ABGR_EXT                       0x8000
+#endif /* GL_EXT_abgr */
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif /* GL_EXT_bgra */
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_EXT_bindable_uniform 1
+#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
+#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
+#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
+#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
+#define GL_UNIFORM_BUFFER_EXT             0x8DEE
+#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
+typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
+typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformBufferEXT (GLuint program, GLint location, GLuint buffer);
+GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint program, GLint location);
+GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint program, GLint location);
+#endif
+#endif /* GL_EXT_bindable_uniform */
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColorEXT (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+#endif
+#endif /* GL_EXT_blend_color */
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+#define GL_BLEND_EQUATION_RGB_EXT         0x8009
+#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum modeRGB, GLenum modeAlpha);
+#endif
+#endif /* GL_EXT_blend_equation_separate */
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+#endif /* GL_EXT_blend_func_separate */
+
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+#endif /* GL_EXT_blend_logic_op */
+
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_BLEND_EQUATION_EXT             0x8009
+typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_blend_minmax */
+
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#endif /* GL_EXT_blend_subtract */
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#endif /* GL_EXT_clip_volume_hint */
+
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#endif /* GL_EXT_cmyka */
+
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorSubTableEXT (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif
+#endif /* GL_EXT_color_subtable */
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLockArraysEXT (GLint first, GLsizei count);
+GLAPI void APIENTRY glUnlockArraysEXT (void);
+#endif
+#endif /* GL_EXT_compiled_vertex_array */
+
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum target, GLenum format, GLenum type, void *image);
+GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+#endif
+#endif /* GL_EXT_convolution */
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
+typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
+typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
+typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
+typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTangent3bEXT (GLbyte tx, GLbyte ty, GLbyte tz);
+GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glTangent3dEXT (GLdouble tx, GLdouble ty, GLdouble tz);
+GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glTangent3fEXT (GLfloat tx, GLfloat ty, GLfloat tz);
+GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glTangent3iEXT (GLint tx, GLint ty, GLint tz);
+GLAPI void APIENTRY glTangent3ivEXT (const GLint *v);
+GLAPI void APIENTRY glTangent3sEXT (GLshort tx, GLshort ty, GLshort tz);
+GLAPI void APIENTRY glTangent3svEXT (const GLshort *v);
+GLAPI void APIENTRY glBinormal3bEXT (GLbyte bx, GLbyte by, GLbyte bz);
+GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glBinormal3dEXT (GLdouble bx, GLdouble by, GLdouble bz);
+GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glBinormal3fEXT (GLfloat bx, GLfloat by, GLfloat bz);
+GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glBinormal3iEXT (GLint bx, GLint by, GLint bz);
+GLAPI void APIENTRY glBinormal3ivEXT (const GLint *v);
+GLAPI void APIENTRY glBinormal3sEXT (GLshort bx, GLshort by, GLshort bz);
+GLAPI void APIENTRY glBinormal3svEXT (const GLshort *v);
+GLAPI void APIENTRY glTangentPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glBinormalPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_coordinate_frame */
+
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_EXT_copy_texture */
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCullParameterdvEXT (GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_cull_vertex */
+
+#ifndef GL_EXT_debug_label
+#define GL_EXT_debug_label 1
+#define GL_PROGRAM_PIPELINE_OBJECT_EXT    0x8A4F
+#define GL_PROGRAM_OBJECT_EXT             0x8B40
+#define GL_SHADER_OBJECT_EXT              0x8B48
+#define GL_BUFFER_OBJECT_EXT              0x9151
+#define GL_QUERY_OBJECT_EXT               0x9153
+#define GL_VERTEX_ARRAY_OBJECT_EXT        0x9154
+typedef void (APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+#endif /* GL_EXT_debug_label */
+
+#ifndef GL_EXT_debug_marker
+#define GL_EXT_debug_marker 1
+typedef void (APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker);
+GLAPI void APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker);
+GLAPI void APIENTRY glPopGroupMarkerEXT (void);
+#endif
+#endif /* GL_EXT_debug_marker */
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
+#define GL_DEPTH_BOUNDS_EXT               0x8891
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthBoundsEXT (GLclampd zmin, GLclampd zmax);
+#endif
+#endif /* GL_EXT_depth_bounds_test */
+
+#ifndef GL_EXT_direct_state_access
+#define GL_EXT_direct_state_access 1
+#define GL_PROGRAM_MATRIX_EXT             0x8E2D
+#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT   0x8E2E
+#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
+typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data);
+typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, void **data);
+typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, void *img);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, void *img);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, void **params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLGETFLOATI_VEXTPROC) (GLenum pname, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETDOUBLEI_VEXTPROC) (GLenum pname, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPOINTERI_VEXTPROC) (GLenum pname, GLuint index, void **params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, void *string);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
+typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYINDEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYNORMALOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
+typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINTEGERVEXTPROC) (GLuint vaobj, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYPOINTERVEXTPROC) (GLuint vaobj, GLenum pname, void **param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, void **param);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLsizeiptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC) (GLuint framebuffer, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEEXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLTEXTUREPAGECOMMITMENTEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC) (GLuint vaobj, GLuint index, GLuint divisor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixPopEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixPushEXT (GLenum mode);
+GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture);
+GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data);
+GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data);
+GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, void **data);
+GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index);
+GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, void *img);
+GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, void *img);
+GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void *APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer);
+GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, void **params);
+GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0);
+GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0);
+GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0);
+GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glEnableClientStateiEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glDisableClientStateiEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glGetFloati_vEXT (GLenum pname, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetDoublei_vEXT (GLenum pname, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetPointeri_vEXT (GLenum pname, GLuint index, void **params);
+GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, void *string);
+GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target);
+GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target);
+GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target);
+GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glNamedCopyBufferSubDataEXT (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glVertexArrayVertexOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayColorOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayEdgeFlagOffsetEXT (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayIndexOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayNormalOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayTexCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayMultiTexCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayFogCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArraySecondaryColorOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayVertexAttribOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayVertexAttribIOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glEnableVertexArrayEXT (GLuint vaobj, GLenum array);
+GLAPI void APIENTRY glDisableVertexArrayEXT (GLuint vaobj, GLenum array);
+GLAPI void APIENTRY glEnableVertexArrayAttribEXT (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glDisableVertexArrayAttribEXT (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glGetVertexArrayIntegervEXT (GLuint vaobj, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayPointervEXT (GLuint vaobj, GLenum pname, void **param);
+GLAPI void APIENTRY glGetVertexArrayIntegeri_vEXT (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayPointeri_vEXT (GLuint vaobj, GLuint index, GLenum pname, void **param);
+GLAPI void *APIENTRY glMapNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glNamedBufferStorageEXT (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glClearNamedBufferDataEXT (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearNamedBufferSubDataEXT (GLuint buffer, GLenum internalformat, GLsizeiptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glNamedFramebufferParameteriEXT (GLuint framebuffer, GLenum pname, GLint param);
+GLAPI void APIENTRY glGetNamedFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x);
+GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glTextureBufferRangeEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glTextureStorage2DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureStorage3DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glVertexArrayBindVertexBufferEXT (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+GLAPI void APIENTRY glVertexArrayVertexAttribFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribIFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribLFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribBindingEXT (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+GLAPI void APIENTRY glVertexArrayVertexBindingDivisorEXT (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+GLAPI void APIENTRY glVertexArrayVertexAttribLOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glTexturePageCommitmentEXT (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+GLAPI void APIENTRY glVertexArrayVertexAttribDivisorEXT (GLuint vaobj, GLuint index, GLuint divisor);
+#endif
+#endif /* GL_EXT_direct_state_access */
+
+#ifndef GL_EXT_draw_buffers2
+#define GL_EXT_draw_buffers2 1
+typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+#endif
+#endif /* GL_EXT_draw_buffers2 */
+
+#ifndef GL_EXT_draw_instanced
+#define GL_EXT_draw_instanced 1
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#endif
+#endif /* GL_EXT_draw_instanced */
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+#endif
+#endif /* GL_EXT_draw_range_elements */
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordfEXT (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoorddEXT (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_fog_coord */
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_EXT_framebuffer_blit 1
+#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
+#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   0x8CA6
+#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+#endif /* GL_EXT_framebuffer_blit */
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_EXT_framebuffer_multisample 1
+#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+#define GL_MAX_SAMPLES_EXT                0x8D57
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_EXT_framebuffer_multisample */
+
+#ifndef GL_EXT_framebuffer_multisample_blit_scaled
+#define GL_EXT_framebuffer_multisample_blit_scaled 1
+#define GL_SCALED_RESOLVE_FASTEST_EXT     0x90BA
+#define GL_SCALED_RESOLVE_NICEST_EXT      0x90BB
+#endif /* GL_EXT_framebuffer_multisample_blit_scaled */
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
+#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
+#define GL_FRAMEBUFFER_EXT                0x8D40
+#define GL_RENDERBUFFER_EXT               0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#define GL_STENCIL_INDEX1_EXT             0x8D46
+#define GL_STENCIL_INDEX4_EXT             0x8D47
+#define GL_STENCIL_INDEX8_EXT             0x8D48
+#define GL_STENCIL_INDEX16_EXT            0x8D49
+#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbufferEXT (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmapEXT (GLenum target);
+#endif
+#endif /* GL_EXT_framebuffer_object */
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_EXT_framebuffer_sRGB 1
+#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
+#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
+#endif /* GL_EXT_framebuffer_sRGB */
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_EXT_geometry_shader4 1
+#define GL_GEOMETRY_SHADER_EXT            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
+#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+#define GL_LINES_ADJACENCY_EXT            0x000A
+#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
+#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value);
+#endif
+#endif /* GL_EXT_geometry_shader4 */
+
+#ifndef GL_EXT_gpu_program_parameters
+#define GL_EXT_gpu_program_parameters 1
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#endif
+#endif /* GL_EXT_gpu_program_parameters */
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_EXT_gpu_shader4 1
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD
+#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
+#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
+#define GL_SAMPLER_BUFFER_EXT             0x8DC2
+#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
+#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
+#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
+#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
+#define GL_INT_SAMPLER_1D_EXT             0x8DC9
+#define GL_INT_SAMPLER_2D_EXT             0x8DCA
+#define GL_INT_SAMPLER_3D_EXT             0x8DCB
+#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
+#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
+#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
+#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_EXT   0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_EXT   0x8905
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1uiEXT (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2uiEXT (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value);
+#endif
+#endif /* GL_EXT_gpu_shader4 */
+
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetHistogramEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmaxEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogramEXT (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmaxEXT (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogramEXT (GLenum target);
+GLAPI void APIENTRY glResetMinmaxEXT (GLenum target);
+#endif
+#endif /* GL_EXT_histogram */
+
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#endif /* GL_EXT_index_array_formats */
+
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexFuncEXT (GLenum func, GLclampf ref);
+#endif
+#endif /* GL_EXT_index_func */
+
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexMaterialEXT (GLenum face, GLenum mode);
+#endif
+#endif /* GL_EXT_index_material */
+
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+#endif /* GL_EXT_index_texture */
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyTextureEXT (GLenum mode);
+GLAPI void APIENTRY glTextureLightEXT (GLenum pname);
+GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode);
+#endif
+#endif /* GL_EXT_light_texture */
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+#endif /* GL_EXT_misc_attribute */
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
+#endif
+#endif /* GL_EXT_multi_draw_arrays */
+
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#define GL_MULTISAMPLE_BIT_EXT            0x20000000
+typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskEXT (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternEXT (GLenum pattern);
+#endif
+#endif /* GL_EXT_multisample */
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_EXT_packed_depth_stencil 1
+#define GL_DEPTH_STENCIL_EXT              0x84F9
+#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
+#define GL_DEPTH24_STENCIL8_EXT           0x88F0
+#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
+#endif /* GL_EXT_packed_depth_stencil */
+
+#ifndef GL_EXT_packed_float
+#define GL_EXT_packed_float 1
+#define GL_R11F_G11F_B10F_EXT             0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
+#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
+#endif /* GL_EXT_packed_float */
+
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#endif /* GL_EXT_packed_pixels */
+
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, void *data);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableEXT (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glGetColorTableEXT (GLenum target, GLenum format, GLenum type, void *data);
+GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_paletted_texture */
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_EXT_pixel_buffer_object 1
+#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
+#endif /* GL_EXT_pixel_buffer_object */
+
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetPixelTransformParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetPixelTransformParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_pixel_transform */
+
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+#endif /* GL_EXT_pixel_transform_color_table */
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfEXT (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvEXT (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_EXT_point_parameters */
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat factor, GLfloat bias);
+#endif
+#endif /* GL_EXT_polygon_offset */
+
+#ifndef GL_EXT_polygon_offset_clamp
+#define GL_EXT_polygon_offset_clamp 1
+#define GL_POLYGON_OFFSET_CLAMP_EXT       0x8E1B
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETCLAMPEXTPROC) (GLfloat factor, GLfloat units, GLfloat clamp);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetClampEXT (GLfloat factor, GLfloat units, GLfloat clamp);
+#endif
+#endif /* GL_EXT_polygon_offset_clamp */
+
+#ifndef GL_EXT_post_depth_coverage
+#define GL_EXT_post_depth_coverage 1
+#endif /* GL_EXT_post_depth_coverage */
+
+#ifndef GL_EXT_provoking_vertex
+#define GL_EXT_provoking_vertex 1
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION_EXT    0x8E4D
+#define GL_LAST_VERTEX_CONVENTION_EXT     0x8E4E
+#define GL_PROVOKING_VERTEX_EXT           0x8E4F
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProvokingVertexEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_provoking_vertex */
+
+#ifndef GL_EXT_raster_multisample
+#define GL_EXT_raster_multisample 1
+#define GL_RASTER_MULTISAMPLE_EXT         0x9327
+#define GL_RASTER_SAMPLES_EXT             0x9328
+#define GL_MAX_RASTER_SAMPLES_EXT         0x9329
+#define GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT 0x932A
+#define GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT 0x932B
+#define GL_EFFECTIVE_RASTER_SAMPLES_EXT   0x932C
+typedef void (APIENTRYP PFNGLRASTERSAMPLESEXTPROC) (GLuint samples, GLboolean fixedsamplelocations);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRasterSamplesEXT (GLuint samples, GLboolean fixedsamplelocations);
+#endif
+#endif /* GL_EXT_raster_multisample */
+
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#endif /* GL_EXT_rescale_normal */
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3iEXT (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_secondary_color */
+
+#ifndef GL_EXT_separate_shader_objects
+#define GL_EXT_separate_shader_objects 1
+#define GL_ACTIVE_PROGRAM_EXT             0x8B8D
+typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
+typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program);
+GLAPI void APIENTRY glActiveProgramEXT (GLuint program);
+GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string);
+#endif
+#endif /* GL_EXT_separate_shader_objects */
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#endif /* GL_EXT_separate_specular_color */
+
+#ifndef GL_EXT_shader_image_load_formatted
+#define GL_EXT_shader_image_load_formatted 1
+#endif /* GL_EXT_shader_image_load_formatted */
+
+#ifndef GL_EXT_shader_image_load_store
+#define GL_EXT_shader_image_load_store 1
+#define GL_MAX_IMAGE_UNITS_EXT            0x8F38
+#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39
+#define GL_IMAGE_BINDING_NAME_EXT         0x8F3A
+#define GL_IMAGE_BINDING_LEVEL_EXT        0x8F3B
+#define GL_IMAGE_BINDING_LAYERED_EXT      0x8F3C
+#define GL_IMAGE_BINDING_LAYER_EXT        0x8F3D
+#define GL_IMAGE_BINDING_ACCESS_EXT       0x8F3E
+#define GL_IMAGE_1D_EXT                   0x904C
+#define GL_IMAGE_2D_EXT                   0x904D
+#define GL_IMAGE_3D_EXT                   0x904E
+#define GL_IMAGE_2D_RECT_EXT              0x904F
+#define GL_IMAGE_CUBE_EXT                 0x9050
+#define GL_IMAGE_BUFFER_EXT               0x9051
+#define GL_IMAGE_1D_ARRAY_EXT             0x9052
+#define GL_IMAGE_2D_ARRAY_EXT             0x9053
+#define GL_IMAGE_CUBE_MAP_ARRAY_EXT       0x9054
+#define GL_IMAGE_2D_MULTISAMPLE_EXT       0x9055
+#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056
+#define GL_INT_IMAGE_1D_EXT               0x9057
+#define GL_INT_IMAGE_2D_EXT               0x9058
+#define GL_INT_IMAGE_3D_EXT               0x9059
+#define GL_INT_IMAGE_2D_RECT_EXT          0x905A
+#define GL_INT_IMAGE_CUBE_EXT             0x905B
+#define GL_INT_IMAGE_BUFFER_EXT           0x905C
+#define GL_INT_IMAGE_1D_ARRAY_EXT         0x905D
+#define GL_INT_IMAGE_2D_ARRAY_EXT         0x905E
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT   0x905F
+#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT   0x9060
+#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061
+#define GL_UNSIGNED_INT_IMAGE_1D_EXT      0x9062
+#define GL_UNSIGNED_INT_IMAGE_2D_EXT      0x9063
+#define GL_UNSIGNED_INT_IMAGE_3D_EXT      0x9064
+#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065
+#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT    0x9066
+#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT  0x9067
+#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068
+#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C
+#define GL_MAX_IMAGE_SAMPLES_EXT          0x906D
+#define GL_IMAGE_BINDING_FORMAT_EXT       0x906E
+#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001
+#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT  0x00000002
+#define GL_UNIFORM_BARRIER_BIT_EXT        0x00000004
+#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT  0x00000008
+#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020
+#define GL_COMMAND_BARRIER_BIT_EXT        0x00000040
+#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT   0x00000080
+#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100
+#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT  0x00000200
+#define GL_FRAMEBUFFER_BARRIER_BIT_EXT    0x00000400
+#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800
+#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000
+#define GL_ALL_BARRIER_BITS_EXT           0xFFFFFFFF
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
+typedef void (APIENTRYP PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindImageTextureEXT (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
+GLAPI void APIENTRY glMemoryBarrierEXT (GLbitfield barriers);
+#endif
+#endif /* GL_EXT_shader_image_load_store */
+
+#ifndef GL_EXT_shader_integer_mix
+#define GL_EXT_shader_integer_mix 1
+#endif /* GL_EXT_shader_integer_mix */
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+#endif /* GL_EXT_shadow_funcs */
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#endif /* GL_EXT_shared_texture_palette */
+
+#ifndef GL_EXT_sparse_texture2
+#define GL_EXT_sparse_texture2 1
+#endif /* GL_EXT_sparse_texture2 */
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_EXT_stencil_clear_tag 1
+#define GL_STENCIL_TAG_BITS_EXT           0x88F2
+#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
+typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilClearTagEXT (GLsizei stencilTagBits, GLuint stencilClearTag);
+#endif
+#endif /* GL_EXT_stencil_clear_tag */
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
+typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum face);
+#endif
+#endif /* GL_EXT_stencil_two_side */
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#endif /* GL_EXT_stencil_wrap */
+
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_EXT_subtexture */
+
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#endif /* GL_EXT_texture */
+
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_EXT_texture3D */
+
+#ifndef GL_EXT_texture_array
+#define GL_EXT_texture_array 1
+#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
+#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif
+#endif /* GL_EXT_texture_array */
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_EXT_texture_buffer_object 1
+#define GL_TEXTURE_BUFFER_EXT             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
+typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+#endif /* GL_EXT_texture_buffer_object */
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_EXT_texture_compression_latc 1
+#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
+#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
+#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
+#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
+#endif /* GL_EXT_texture_compression_latc */
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_EXT_texture_compression_rgtc 1
+#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
+#endif /* GL_EXT_texture_compression_rgtc */
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_EXT_texture_compression_s3tc 1
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif /* GL_EXT_texture_compression_s3tc */
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_EXT_texture_cube_map 1
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#endif /* GL_EXT_texture_cube_map */
+
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+#endif /* GL_EXT_texture_env_add */
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#endif /* GL_EXT_texture_env_combine */
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+#define GL_DOT3_RGB_EXT                   0x8740
+#define GL_DOT3_RGBA_EXT                  0x8741
+#endif /* GL_EXT_texture_env_dot3 */
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#endif /* GL_EXT_texture_filter_anisotropic */
+
+#ifndef GL_EXT_texture_filter_minmax
+#define GL_EXT_texture_filter_minmax 1
+#endif /* GL_EXT_texture_filter_minmax */
+
+#ifndef GL_EXT_texture_integer
+#define GL_EXT_texture_integer 1
+#define GL_RGBA32UI_EXT                   0x8D70
+#define GL_RGB32UI_EXT                    0x8D71
+#define GL_ALPHA32UI_EXT                  0x8D72
+#define GL_INTENSITY32UI_EXT              0x8D73
+#define GL_LUMINANCE32UI_EXT              0x8D74
+#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
+#define GL_RGBA16UI_EXT                   0x8D76
+#define GL_RGB16UI_EXT                    0x8D77
+#define GL_ALPHA16UI_EXT                  0x8D78
+#define GL_INTENSITY16UI_EXT              0x8D79
+#define GL_LUMINANCE16UI_EXT              0x8D7A
+#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
+#define GL_RGBA8UI_EXT                    0x8D7C
+#define GL_RGB8UI_EXT                     0x8D7D
+#define GL_ALPHA8UI_EXT                   0x8D7E
+#define GL_INTENSITY8UI_EXT               0x8D7F
+#define GL_LUMINANCE8UI_EXT               0x8D80
+#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
+#define GL_RGBA32I_EXT                    0x8D82
+#define GL_RGB32I_EXT                     0x8D83
+#define GL_ALPHA32I_EXT                   0x8D84
+#define GL_INTENSITY32I_EXT               0x8D85
+#define GL_LUMINANCE32I_EXT               0x8D86
+#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
+#define GL_RGBA16I_EXT                    0x8D88
+#define GL_RGB16I_EXT                     0x8D89
+#define GL_ALPHA16I_EXT                   0x8D8A
+#define GL_INTENSITY16I_EXT               0x8D8B
+#define GL_LUMINANCE16I_EXT               0x8D8C
+#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
+#define GL_RGBA8I_EXT                     0x8D8E
+#define GL_RGB8I_EXT                      0x8D8F
+#define GL_ALPHA8I_EXT                    0x8D90
+#define GL_INTENSITY8I_EXT                0x8D91
+#define GL_LUMINANCE8I_EXT                0x8D92
+#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
+#define GL_RED_INTEGER_EXT                0x8D94
+#define GL_GREEN_INTEGER_EXT              0x8D95
+#define GL_BLUE_INTEGER_EXT               0x8D96
+#define GL_ALPHA_INTEGER_EXT              0x8D97
+#define GL_RGB_INTEGER_EXT                0x8D98
+#define GL_RGBA_INTEGER_EXT               0x8D99
+#define GL_BGR_INTEGER_EXT                0x8D9A
+#define GL_BGRA_INTEGER_EXT               0x8D9B
+#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
+#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
+#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
+typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearColorIiEXT (GLint red, GLint green, GLint blue, GLint alpha);
+GLAPI void APIENTRY glClearColorIuiEXT (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#endif
+#endif /* GL_EXT_texture_integer */
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#endif /* GL_EXT_texture_lod_bias */
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+#define GL_MIRROR_CLAMP_EXT               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
+#endif /* GL_EXT_texture_mirror_clamp */
+
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei n, const GLuint *textures, GLboolean *residences);
+GLAPI void APIENTRY glBindTextureEXT (GLenum target, GLuint texture);
+GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures);
+GLAPI void APIENTRY glGenTexturesEXT (GLsizei n, GLuint *textures);
+GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint texture);
+GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif
+#endif /* GL_EXT_texture_object */
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_texture_perturb_normal */
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_EXT_texture_sRGB 1
+#define GL_SRGB_EXT                       0x8C40
+#define GL_SRGB8_EXT                      0x8C41
+#define GL_SRGB_ALPHA_EXT                 0x8C42
+#define GL_SRGB8_ALPHA8_EXT               0x8C43
+#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
+#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
+#define GL_SLUMINANCE_EXT                 0x8C46
+#define GL_SLUMINANCE8_EXT                0x8C47
+#define GL_COMPRESSED_SRGB_EXT            0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
+#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+#endif /* GL_EXT_texture_sRGB */
+
+#ifndef GL_EXT_texture_sRGB_decode
+#define GL_EXT_texture_sRGB_decode 1
+#define GL_TEXTURE_SRGB_DECODE_EXT        0x8A48
+#define GL_DECODE_EXT                     0x8A49
+#define GL_SKIP_DECODE_EXT                0x8A4A
+#endif /* GL_EXT_texture_sRGB_decode */
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_EXT_texture_shared_exponent 1
+#define GL_RGB9_E5_EXT                    0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
+#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
+#endif /* GL_EXT_texture_shared_exponent */
+
+#ifndef GL_EXT_texture_snorm
+#define GL_EXT_texture_snorm 1
+#define GL_ALPHA_SNORM                    0x9010
+#define GL_LUMINANCE_SNORM                0x9011
+#define GL_LUMINANCE_ALPHA_SNORM          0x9012
+#define GL_INTENSITY_SNORM                0x9013
+#define GL_ALPHA8_SNORM                   0x9014
+#define GL_LUMINANCE8_SNORM               0x9015
+#define GL_LUMINANCE8_ALPHA8_SNORM        0x9016
+#define GL_INTENSITY8_SNORM               0x9017
+#define GL_ALPHA16_SNORM                  0x9018
+#define GL_LUMINANCE16_SNORM              0x9019
+#define GL_LUMINANCE16_ALPHA16_SNORM      0x901A
+#define GL_INTENSITY16_SNORM              0x901B
+#define GL_RED_SNORM                      0x8F90
+#define GL_RG_SNORM                       0x8F91
+#define GL_RGB_SNORM                      0x8F92
+#define GL_RGBA_SNORM                     0x8F93
+#endif /* GL_EXT_texture_snorm */
+
+#ifndef GL_EXT_texture_swizzle
+#define GL_EXT_texture_swizzle 1
+#define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
+#define GL_TEXTURE_SWIZZLE_G_EXT          0x8E43
+#define GL_TEXTURE_SWIZZLE_B_EXT          0x8E44
+#define GL_TEXTURE_SWIZZLE_A_EXT          0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA_EXT       0x8E46
+#endif /* GL_EXT_texture_swizzle */
+
+#ifndef GL_EXT_timer_query
+#define GL_EXT_timer_query 1
+#define GL_TIME_ELAPSED_EXT               0x88BF
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64 *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64 *params);
+#endif
+#endif /* GL_EXT_timer_query */
+
+#ifndef GL_EXT_transform_feedback
+#define GL_EXT_transform_feedback 1
+#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT  0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
+#define GL_INTERLEAVED_ATTRIBS_EXT        0x8C8C
+#define GL_SEPARATE_ATTRIBS_EXT           0x8C8D
+#define GL_PRIMITIVES_GENERATED_EXT       0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
+#define GL_RASTERIZER_DISCARD_EXT         0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackEXT (void);
+GLAPI void APIENTRY glBindBufferRangeEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseEXT (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#endif
+#endif /* GL_EXT_transform_feedback */
+
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
+typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, void **params);
+typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glArrayElementEXT (GLint i);
+GLAPI void APIENTRY glColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glDrawArraysEXT (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei stride, GLsizei count, const GLboolean *pointer);
+GLAPI void APIENTRY glGetPointervEXT (GLenum pname, void **params);
+GLAPI void APIENTRY glIndexPointerEXT (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glNormalPointerEXT (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glTexCoordPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glVertexPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+#endif
+#endif /* GL_EXT_vertex_array */
+
+#ifndef GL_EXT_vertex_array_bgra
+#define GL_EXT_vertex_array_bgra 1
+#endif /* GL_EXT_vertex_array_bgra */
+
+#ifndef GL_EXT_vertex_attrib_64bit
+#define GL_EXT_vertex_attrib_64bit 1
+#define GL_DOUBLE_VEC2_EXT                0x8FFC
+#define GL_DOUBLE_VEC3_EXT                0x8FFD
+#define GL_DOUBLE_VEC4_EXT                0x8FFE
+#define GL_DOUBLE_MAT2_EXT                0x8F46
+#define GL_DOUBLE_MAT3_EXT                0x8F47
+#define GL_DOUBLE_MAT4_EXT                0x8F48
+#define GL_DOUBLE_MAT2x3_EXT              0x8F49
+#define GL_DOUBLE_MAT2x4_EXT              0x8F4A
+#define GL_DOUBLE_MAT3x2_EXT              0x8F4B
+#define GL_DOUBLE_MAT3x4_EXT              0x8F4C
+#define GL_DOUBLE_MAT4x2_EXT              0x8F4D
+#define GL_DOUBLE_MAT4x3_EXT              0x8F4E
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribL1dEXT (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttribL2dEXT (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttribL3dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttribL4dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttribL1dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL2dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL3dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL4dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribLPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribLdvEXT (GLuint index, GLenum pname, GLdouble *params);
+#endif
+#endif /* GL_EXT_vertex_attrib_64bit */
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+#define GL_VERTEX_SHADER_EXT              0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
+#define GL_OP_INDEX_EXT                   0x8782
+#define GL_OP_NEGATE_EXT                  0x8783
+#define GL_OP_DOT3_EXT                    0x8784
+#define GL_OP_DOT4_EXT                    0x8785
+#define GL_OP_MUL_EXT                     0x8786
+#define GL_OP_ADD_EXT                     0x8787
+#define GL_OP_MADD_EXT                    0x8788
+#define GL_OP_FRAC_EXT                    0x8789
+#define GL_OP_MAX_EXT                     0x878A
+#define GL_OP_MIN_EXT                     0x878B
+#define GL_OP_SET_GE_EXT                  0x878C
+#define GL_OP_SET_LT_EXT                  0x878D
+#define GL_OP_CLAMP_EXT                   0x878E
+#define GL_OP_FLOOR_EXT                   0x878F
+#define GL_OP_ROUND_EXT                   0x8790
+#define GL_OP_EXP_BASE_2_EXT              0x8791
+#define GL_OP_LOG_BASE_2_EXT              0x8792
+#define GL_OP_POWER_EXT                   0x8793
+#define GL_OP_RECIP_EXT                   0x8794
+#define GL_OP_RECIP_SQRT_EXT              0x8795
+#define GL_OP_SUB_EXT                     0x8796
+#define GL_OP_CROSS_PRODUCT_EXT           0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
+#define GL_OP_MOV_EXT                     0x8799
+#define GL_OUTPUT_VERTEX_EXT              0x879A
+#define GL_OUTPUT_COLOR0_EXT              0x879B
+#define GL_OUTPUT_COLOR1_EXT              0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
+#define GL_OUTPUT_FOG_EXT                 0x87BD
+#define GL_SCALAR_EXT                     0x87BE
+#define GL_VECTOR_EXT                     0x87BF
+#define GL_MATRIX_EXT                     0x87C0
+#define GL_VARIANT_EXT                    0x87C1
+#define GL_INVARIANT_EXT                  0x87C2
+#define GL_LOCAL_CONSTANT_EXT             0x87C3
+#define GL_LOCAL_EXT                      0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
+#define GL_X_EXT                          0x87D5
+#define GL_Y_EXT                          0x87D6
+#define GL_Z_EXT                          0x87D7
+#define GL_W_EXT                          0x87D8
+#define GL_NEGATIVE_X_EXT                 0x87D9
+#define GL_NEGATIVE_Y_EXT                 0x87DA
+#define GL_NEGATIVE_Z_EXT                 0x87DB
+#define GL_NEGATIVE_W_EXT                 0x87DC
+#define GL_ZERO_EXT                       0x87DD
+#define GL_ONE_EXT                        0x87DE
+#define GL_NEGATIVE_ONE_EXT               0x87DF
+#define GL_NORMALIZED_RANGE_EXT           0x87E0
+#define GL_FULL_RANGE_EXT                 0x87E1
+#define GL_CURRENT_VERTEX_EXT             0x87E2
+#define GL_MVP_MATRIX_EXT                 0x87E3
+#define GL_VARIANT_VALUE_EXT              0x87E4
+#define GL_VARIANT_DATATYPE_EXT           0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
+#define GL_VARIANT_ARRAY_EXT              0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
+#define GL_INVARIANT_VALUE_EXT            0x87EA
+#define GL_INVARIANT_DATATYPE_EXT         0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
+typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const void *addr);
+typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const void *addr);
+typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
+typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
+typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
+typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
+typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
+typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
+typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const void *addr);
+typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, void **data);
+typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVertexShaderEXT (void);
+GLAPI void APIENTRY glEndVertexShaderEXT (void);
+GLAPI void APIENTRY glBindVertexShaderEXT (GLuint id);
+GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint range);
+GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint id);
+GLAPI void APIENTRY glShaderOp1EXT (GLenum op, GLuint res, GLuint arg1);
+GLAPI void APIENTRY glShaderOp2EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+GLAPI void APIENTRY glShaderOp3EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+GLAPI void APIENTRY glSwizzleEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glWriteMaskEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glInsertComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI void APIENTRY glExtractComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+GLAPI void APIENTRY glSetInvariantEXT (GLuint id, GLenum type, const void *addr);
+GLAPI void APIENTRY glSetLocalConstantEXT (GLuint id, GLenum type, const void *addr);
+GLAPI void APIENTRY glVariantbvEXT (GLuint id, const GLbyte *addr);
+GLAPI void APIENTRY glVariantsvEXT (GLuint id, const GLshort *addr);
+GLAPI void APIENTRY glVariantivEXT (GLuint id, const GLint *addr);
+GLAPI void APIENTRY glVariantfvEXT (GLuint id, const GLfloat *addr);
+GLAPI void APIENTRY glVariantdvEXT (GLuint id, const GLdouble *addr);
+GLAPI void APIENTRY glVariantubvEXT (GLuint id, const GLubyte *addr);
+GLAPI void APIENTRY glVariantusvEXT (GLuint id, const GLushort *addr);
+GLAPI void APIENTRY glVariantuivEXT (GLuint id, const GLuint *addr);
+GLAPI void APIENTRY glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, const void *addr);
+GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint id);
+GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint id);
+GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum light, GLenum value);
+GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum face, GLenum value);
+GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum unit, GLenum coord, GLenum value);
+GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum unit, GLenum value);
+GLAPI GLuint APIENTRY glBindParameterEXT (GLenum value);
+GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint id, GLenum cap);
+GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetVariantPointervEXT (GLuint id, GLenum value, void **data);
+GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+#endif
+#endif /* GL_EXT_vertex_shader */
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     0x0BA3
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          0x0BA6
+#define GL_MODELVIEW1_MATRIX_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 0x1700
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight);
+GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight);
+GLAPI void APIENTRY glVertexWeightPointerEXT (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_vertex_weighting */
+
+#ifndef GL_EXT_window_rectangles
+#define GL_EXT_window_rectangles 1
+#define GL_INCLUSIVE_EXT                  0x8F10
+#define GL_EXCLUSIVE_EXT                  0x8F11
+#define GL_WINDOW_RECTANGLE_EXT           0x8F12
+#define GL_WINDOW_RECTANGLE_MODE_EXT      0x8F13
+#define GL_MAX_WINDOW_RECTANGLES_EXT      0x8F14
+#define GL_NUM_WINDOW_RECTANGLES_EXT      0x8F15
+typedef void (APIENTRYP PFNGLWINDOWRECTANGLESEXTPROC) (GLenum mode, GLsizei count, const GLint *box);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowRectanglesEXT (GLenum mode, GLsizei count, const GLint *box);
+#endif
+#endif /* GL_EXT_window_rectangles */
+
+#ifndef GL_EXT_x11_sync_object
+#define GL_EXT_x11_sync_object 1
+#define GL_SYNC_X11_FENCE_EXT             0x90E1
+typedef GLsync (APIENTRYP PFNGLIMPORTSYNCEXTPROC) (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLsync APIENTRY glImportSyncEXT (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
+#endif
+#endif /* GL_EXT_x11_sync_object */
+
+#ifndef GL_GREMEDY_frame_terminator
+#define GL_GREMEDY_frame_terminator 1
+typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
+#endif
+#endif /* GL_GREMEDY_frame_terminator */
+
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const void *string);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei len, const void *string);
+#endif
+#endif /* GL_GREMEDY_string_marker */
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#endif /* GL_HP_convolution_border_modes */
+
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImageTransformParameteriHP (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glImageTransformParameterfHP (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glImageTransformParameterivHP (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_HP_image_transform */
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#endif /* GL_HP_occlusion_test */
+
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#endif /* GL_HP_texture_lighting */
+
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+#define GL_CULL_VERTEX_IBM                103050
+#endif /* GL_IBM_cull_vertex */
+
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, GLint modestride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, GLint modestride);
+#endif
+#endif /* GL_IBM_multimode_draw_arrays */
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#endif /* GL_IBM_rasterpos_clip */
+
+#ifndef GL_IBM_static_data
+#define GL_IBM_static_data 1
+#define GL_ALL_STATIC_DATA_IBM            103060
+#define GL_STATIC_VERTEX_ARRAY_IBM        103061
+typedef void (APIENTRYP PFNGLFLUSHSTATICDATAIBMPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushStaticDataIBM (GLenum target);
+#endif
+#endif /* GL_IBM_static_data */
+
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_IBM_texture_mirrored_repeat 1
+#define GL_MIRRORED_REPEAT_IBM            0x8370
+#endif /* GL_IBM_texture_mirrored_repeat */
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint stride, const GLboolean **pointer, GLint ptrstride);
+GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glIndexPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glNormalPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glTexCoordPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glVertexPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+#endif
+#endif /* GL_IBM_vertex_array_lists */
+
+#ifndef GL_INGR_blend_func_separate
+#define GL_INGR_blend_func_separate 1
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+#endif /* GL_INGR_blend_func_separate */
+
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#endif /* GL_INGR_color_clamp */
+
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+#define GL_INTERLACE_READ_INGR            0x8568
+#endif /* GL_INGR_interlace_read */
+
+#ifndef GL_INTEL_conservative_rasterization
+#define GL_INTEL_conservative_rasterization 1
+#define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
+#endif /* GL_INTEL_conservative_rasterization */
+
+#ifndef GL_INTEL_fragment_shader_ordering
+#define GL_INTEL_fragment_shader_ordering 1
+#endif /* GL_INTEL_fragment_shader_ordering */
+
+#ifndef GL_INTEL_framebuffer_CMAA
+#define GL_INTEL_framebuffer_CMAA 1
+typedef void (APIENTRYP PFNGLAPPLYFRAMEBUFFERATTACHMENTCMAAINTELPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyFramebufferAttachmentCMAAINTEL (void);
+#endif
+#endif /* GL_INTEL_framebuffer_CMAA */
+
+#ifndef GL_INTEL_map_texture
+#define GL_INTEL_map_texture 1
+#define GL_TEXTURE_MEMORY_LAYOUT_INTEL    0x83FF
+#define GL_LAYOUT_DEFAULT_INTEL           0
+#define GL_LAYOUT_LINEAR_INTEL            1
+#define GL_LAYOUT_LINEAR_CPU_CACHED_INTEL 2
+typedef void (APIENTRYP PFNGLSYNCTEXTUREINTELPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLUNMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level);
+typedef void *(APIENTRYP PFNGLMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level, GLbitfield access, GLint *stride, GLenum *layout);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSyncTextureINTEL (GLuint texture);
+GLAPI void APIENTRY glUnmapTexture2DINTEL (GLuint texture, GLint level);
+GLAPI void *APIENTRY glMapTexture2DINTEL (GLuint texture, GLint level, GLbitfield access, GLint *stride, GLenum *layout);
+#endif
+#endif /* GL_INTEL_map_texture */
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexPointervINTEL (GLint size, GLenum type, const void **pointer);
+GLAPI void APIENTRY glNormalPointervINTEL (GLenum type, const void **pointer);
+GLAPI void APIENTRY glColorPointervINTEL (GLint size, GLenum type, const void **pointer);
+GLAPI void APIENTRY glTexCoordPointervINTEL (GLint size, GLenum type, const void **pointer);
+#endif
+#endif /* GL_INTEL_parallel_arrays */
+
+#ifndef GL_INTEL_performance_query
+#define GL_INTEL_performance_query 1
+#define GL_PERFQUERY_SINGLE_CONTEXT_INTEL 0x00000000
+#define GL_PERFQUERY_GLOBAL_CONTEXT_INTEL 0x00000001
+#define GL_PERFQUERY_WAIT_INTEL           0x83FB
+#define GL_PERFQUERY_FLUSH_INTEL          0x83FA
+#define GL_PERFQUERY_DONOT_FLUSH_INTEL    0x83F9
+#define GL_PERFQUERY_COUNTER_EVENT_INTEL  0x94F0
+#define GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL 0x94F1
+#define GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL 0x94F2
+#define GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL 0x94F3
+#define GL_PERFQUERY_COUNTER_RAW_INTEL    0x94F4
+#define GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL 0x94F5
+#define GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL 0x94F8
+#define GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL 0x94F9
+#define GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL 0x94FA
+#define GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL 0x94FB
+#define GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL 0x94FC
+#define GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL 0x94FD
+#define GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL 0x94FE
+#define GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL 0x94FF
+#define GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL 0x9500
+typedef void (APIENTRYP PFNGLBEGINPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLCREATEPERFQUERYINTELPROC) (GLuint queryId, GLuint *queryHandle);
+typedef void (APIENTRYP PFNGLDELETEPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
+typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
+typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
+typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
+typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
+typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginPerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glCreatePerfQueryINTEL (GLuint queryId, GLuint *queryHandle);
+GLAPI void APIENTRY glDeletePerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
+GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
+GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
+GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
+GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
+GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
+#endif
+#endif /* GL_INTEL_performance_query */
+
+#ifndef GL_MESAX_texture_stack
+#define GL_MESAX_texture_stack 1
+#define GL_TEXTURE_1D_STACK_MESAX         0x8759
+#define GL_TEXTURE_2D_STACK_MESAX         0x875A
+#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
+#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
+#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
+#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
+#endif /* GL_MESAX_texture_stack */
+
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+#define GL_PACK_INVERT_MESA               0x8758
+#endif /* GL_MESA_pack_invert */
+
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glResizeBuffersMESA (void);
+#endif
+#endif /* GL_MESA_resize_buffers */
+
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dMESA (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fMESA (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iMESA (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sMESA (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dMESA (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fMESA (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iMESA (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sMESA (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos4dMESA (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos4fMESA (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos4iMESA (GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos4sMESA (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v);
+#endif
+#endif /* GL_MESA_window_pos */
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
+#define GL_YCBCR_MESA                     0x8757
+#endif /* GL_MESA_ycbcr_texture */
+
+#ifndef GL_NVX_conditional_render
+#define GL_NVX_conditional_render 1
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVXPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNVX (GLuint id);
+GLAPI void APIENTRY glEndConditionalRenderNVX (void);
+#endif
+#endif /* GL_NVX_conditional_render */
+
+#ifndef GL_NVX_gpu_memory_info
+#define GL_NVX_gpu_memory_info 1
+#define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047
+#define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048
+#define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049
+#define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A
+#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B
+#endif /* GL_NVX_gpu_memory_info */
+
+#ifndef GL_NV_bindless_multi_draw_indirect
+#define GL_NV_bindless_multi_draw_indirect 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectBindlessNV (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+GLAPI void APIENTRY glMultiDrawElementsIndirectBindlessNV (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+#endif
+#endif /* GL_NV_bindless_multi_draw_indirect */
+
+#ifndef GL_NV_bindless_multi_draw_indirect_count
+#define GL_NV_bindless_multi_draw_indirect_count 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectBindlessCountNV (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+GLAPI void APIENTRY glMultiDrawElementsIndirectBindlessCountNV (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+#endif
+#endif /* GL_NV_bindless_multi_draw_indirect_count */
+
+#ifndef GL_NV_bindless_texture
+#define GL_NV_bindless_texture 1
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLENVPROC) (GLuint texture);
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLENVPROC) (GLuint texture, GLuint sampler);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC) (GLuint64 handle);
+typedef GLuint64 (APIENTRYP PFNGLGETIMAGEHANDLENVPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64NVPROC) (GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC) (GLuint program, GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
+typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint64 APIENTRY glGetTextureHandleNV (GLuint texture);
+GLAPI GLuint64 APIENTRY glGetTextureSamplerHandleNV (GLuint texture, GLuint sampler);
+GLAPI void APIENTRY glMakeTextureHandleResidentNV (GLuint64 handle);
+GLAPI void APIENTRY glMakeTextureHandleNonResidentNV (GLuint64 handle);
+GLAPI GLuint64 APIENTRY glGetImageHandleNV (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+GLAPI void APIENTRY glMakeImageHandleResidentNV (GLuint64 handle, GLenum access);
+GLAPI void APIENTRY glMakeImageHandleNonResidentNV (GLuint64 handle);
+GLAPI void APIENTRY glUniformHandleui64NV (GLint location, GLuint64 value);
+GLAPI void APIENTRY glUniformHandleui64vNV (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniformHandleui64NV (GLuint program, GLint location, GLuint64 value);
+GLAPI void APIENTRY glProgramUniformHandleui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+GLAPI GLboolean APIENTRY glIsTextureHandleResidentNV (GLuint64 handle);
+GLAPI GLboolean APIENTRY glIsImageHandleResidentNV (GLuint64 handle);
+#endif
+#endif /* GL_NV_bindless_texture */
+
+#ifndef GL_NV_blend_equation_advanced
+#define GL_NV_blend_equation_advanced 1
+#define GL_BLEND_OVERLAP_NV               0x9281
+#define GL_BLEND_PREMULTIPLIED_SRC_NV     0x9280
+#define GL_BLUE_NV                        0x1905
+#define GL_COLORBURN_NV                   0x929A
+#define GL_COLORDODGE_NV                  0x9299
+#define GL_CONJOINT_NV                    0x9284
+#define GL_CONTRAST_NV                    0x92A1
+#define GL_DARKEN_NV                      0x9297
+#define GL_DIFFERENCE_NV                  0x929E
+#define GL_DISJOINT_NV                    0x9283
+#define GL_DST_ATOP_NV                    0x928F
+#define GL_DST_IN_NV                      0x928B
+#define GL_DST_NV                         0x9287
+#define GL_DST_OUT_NV                     0x928D
+#define GL_DST_OVER_NV                    0x9289
+#define GL_EXCLUSION_NV                   0x92A0
+#define GL_GREEN_NV                       0x1904
+#define GL_HARDLIGHT_NV                   0x929B
+#define GL_HARDMIX_NV                     0x92A9
+#define GL_HSL_COLOR_NV                   0x92AF
+#define GL_HSL_HUE_NV                     0x92AD
+#define GL_HSL_LUMINOSITY_NV              0x92B0
+#define GL_HSL_SATURATION_NV              0x92AE
+#define GL_INVERT_OVG_NV                  0x92B4
+#define GL_INVERT_RGB_NV                  0x92A3
+#define GL_LIGHTEN_NV                     0x9298
+#define GL_LINEARBURN_NV                  0x92A5
+#define GL_LINEARDODGE_NV                 0x92A4
+#define GL_LINEARLIGHT_NV                 0x92A7
+#define GL_MINUS_CLAMPED_NV               0x92B3
+#define GL_MINUS_NV                       0x929F
+#define GL_MULTIPLY_NV                    0x9294
+#define GL_OVERLAY_NV                     0x9296
+#define GL_PINLIGHT_NV                    0x92A8
+#define GL_PLUS_CLAMPED_ALPHA_NV          0x92B2
+#define GL_PLUS_CLAMPED_NV                0x92B1
+#define GL_PLUS_DARKER_NV                 0x9292
+#define GL_PLUS_NV                        0x9291
+#define GL_RED_NV                         0x1903
+#define GL_SCREEN_NV                      0x9295
+#define GL_SOFTLIGHT_NV                   0x929C
+#define GL_SRC_ATOP_NV                    0x928E
+#define GL_SRC_IN_NV                      0x928A
+#define GL_SRC_NV                         0x9286
+#define GL_SRC_OUT_NV                     0x928C
+#define GL_SRC_OVER_NV                    0x9288
+#define GL_UNCORRELATED_NV                0x9282
+#define GL_VIVIDLIGHT_NV                  0x92A6
+#define GL_XOR_NV                         0x1506
+typedef void (APIENTRYP PFNGLBLENDPARAMETERINVPROC) (GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLBLENDBARRIERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendParameteriNV (GLenum pname, GLint value);
+GLAPI void APIENTRY glBlendBarrierNV (void);
+#endif
+#endif /* GL_NV_blend_equation_advanced */
+
+#ifndef GL_NV_blend_equation_advanced_coherent
+#define GL_NV_blend_equation_advanced_coherent 1
+#define GL_BLEND_ADVANCED_COHERENT_NV     0x9285
+#endif /* GL_NV_blend_equation_advanced_coherent */
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+#endif /* GL_NV_blend_square */
+
+#ifndef GL_NV_clip_space_w_scaling
+#define GL_NV_clip_space_w_scaling 1
+#define GL_VIEWPORT_POSITION_W_SCALE_NV   0x937C
+#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D
+#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E
+typedef void (APIENTRYP PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glViewportPositionWScaleNV (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
+#endif
+#endif /* GL_NV_clip_space_w_scaling */
+
+#ifndef GL_NV_command_list
+#define GL_NV_command_list 1
+#define GL_TERMINATE_SEQUENCE_COMMAND_NV  0x0000
+#define GL_NOP_COMMAND_NV                 0x0001
+#define GL_DRAW_ELEMENTS_COMMAND_NV       0x0002
+#define GL_DRAW_ARRAYS_COMMAND_NV         0x0003
+#define GL_DRAW_ELEMENTS_STRIP_COMMAND_NV 0x0004
+#define GL_DRAW_ARRAYS_STRIP_COMMAND_NV   0x0005
+#define GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV 0x0006
+#define GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV 0x0007
+#define GL_ELEMENT_ADDRESS_COMMAND_NV     0x0008
+#define GL_ATTRIBUTE_ADDRESS_COMMAND_NV   0x0009
+#define GL_UNIFORM_ADDRESS_COMMAND_NV     0x000A
+#define GL_BLEND_COLOR_COMMAND_NV         0x000B
+#define GL_STENCIL_REF_COMMAND_NV         0x000C
+#define GL_LINE_WIDTH_COMMAND_NV          0x000D
+#define GL_POLYGON_OFFSET_COMMAND_NV      0x000E
+#define GL_ALPHA_REF_COMMAND_NV           0x000F
+#define GL_VIEWPORT_COMMAND_NV            0x0010
+#define GL_SCISSOR_COMMAND_NV             0x0011
+#define GL_FRONT_FACE_COMMAND_NV          0x0012
+typedef void (APIENTRYP PFNGLCREATESTATESNVPROC) (GLsizei n, GLuint *states);
+typedef void (APIENTRYP PFNGLDELETESTATESNVPROC) (GLsizei n, const GLuint *states);
+typedef GLboolean (APIENTRYP PFNGLISSTATENVPROC) (GLuint state);
+typedef void (APIENTRYP PFNGLSTATECAPTURENVPROC) (GLuint state, GLenum mode);
+typedef GLuint (APIENTRYP PFNGLGETCOMMANDHEADERNVPROC) (GLenum tokenID, GLuint size);
+typedef GLushort (APIENTRYP PFNGLGETSTAGEINDEXNVPROC) (GLenum shadertype);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSNVPROC) (GLenum primitiveMode, GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, GLuint count);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSADDRESSNVPROC) (GLenum primitiveMode, const GLuint64 *indirects, const GLsizei *sizes, GLuint count);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSSTATESNVPROC) (GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC) (const GLuint64 *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+typedef void (APIENTRYP PFNGLCREATECOMMANDLISTSNVPROC) (GLsizei n, GLuint *lists);
+typedef void (APIENTRYP PFNGLDELETECOMMANDLISTSNVPROC) (GLsizei n, const GLuint *lists);
+typedef GLboolean (APIENTRYP PFNGLISCOMMANDLISTNVPROC) (GLuint list);
+typedef void (APIENTRYP PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC) (GLuint list, GLuint segment, const void **indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+typedef void (APIENTRYP PFNGLCOMMANDLISTSEGMENTSNVPROC) (GLuint list, GLuint segments);
+typedef void (APIENTRYP PFNGLCOMPILECOMMANDLISTNVPROC) (GLuint list);
+typedef void (APIENTRYP PFNGLCALLCOMMANDLISTNVPROC) (GLuint list);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCreateStatesNV (GLsizei n, GLuint *states);
+GLAPI void APIENTRY glDeleteStatesNV (GLsizei n, const GLuint *states);
+GLAPI GLboolean APIENTRY glIsStateNV (GLuint state);
+GLAPI void APIENTRY glStateCaptureNV (GLuint state, GLenum mode);
+GLAPI GLuint APIENTRY glGetCommandHeaderNV (GLenum tokenID, GLuint size);
+GLAPI GLushort APIENTRY glGetStageIndexNV (GLenum shadertype);
+GLAPI void APIENTRY glDrawCommandsNV (GLenum primitiveMode, GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, GLuint count);
+GLAPI void APIENTRY glDrawCommandsAddressNV (GLenum primitiveMode, const GLuint64 *indirects, const GLsizei *sizes, GLuint count);
+GLAPI void APIENTRY glDrawCommandsStatesNV (GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+GLAPI void APIENTRY glDrawCommandsStatesAddressNV (const GLuint64 *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+GLAPI void APIENTRY glCreateCommandListsNV (GLsizei n, GLuint *lists);
+GLAPI void APIENTRY glDeleteCommandListsNV (GLsizei n, const GLuint *lists);
+GLAPI GLboolean APIENTRY glIsCommandListNV (GLuint list);
+GLAPI void APIENTRY glListDrawCommandsStatesClientNV (GLuint list, GLuint segment, const void **indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+GLAPI void APIENTRY glCommandListSegmentsNV (GLuint list, GLuint segments);
+GLAPI void APIENTRY glCompileCommandListNV (GLuint list);
+GLAPI void APIENTRY glCallCommandListNV (GLuint list);
+#endif
+#endif /* GL_NV_command_list */
+
+#ifndef GL_NV_compute_program5
+#define GL_NV_compute_program5 1
+#define GL_COMPUTE_PROGRAM_NV             0x90FB
+#define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC
+#endif /* GL_NV_compute_program5 */
+
+#ifndef GL_NV_conditional_render
+#define GL_NV_conditional_render 1
+#define GL_QUERY_WAIT_NV                  0x8E13
+#define GL_QUERY_NO_WAIT_NV               0x8E14
+#define GL_QUERY_BY_REGION_WAIT_NV        0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT_NV     0x8E16
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRenderNV (void);
+#endif
+#endif /* GL_NV_conditional_render */
+
+#ifndef GL_NV_conservative_raster
+#define GL_NV_conservative_raster 1
+#define GL_CONSERVATIVE_RASTERIZATION_NV  0x9346
+#define GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV 0x9347
+#define GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV 0x9348
+#define GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV 0x9349
+typedef void (APIENTRYP PFNGLSUBPIXELPRECISIONBIASNVPROC) (GLuint xbits, GLuint ybits);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSubpixelPrecisionBiasNV (GLuint xbits, GLuint ybits);
+#endif
+#endif /* GL_NV_conservative_raster */
+
+#ifndef GL_NV_conservative_raster_dilate
+#define GL_NV_conservative_raster_dilate 1
+#define GL_CONSERVATIVE_RASTER_DILATE_NV  0x9379
+#define GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV 0x937A
+#define GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV 0x937B
+typedef void (APIENTRYP PFNGLCONSERVATIVERASTERPARAMETERFNVPROC) (GLenum pname, GLfloat value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConservativeRasterParameterfNV (GLenum pname, GLfloat value);
+#endif
+#endif /* GL_NV_conservative_raster_dilate */
+
+#ifndef GL_NV_conservative_raster_pre_snap_triangles
+#define GL_NV_conservative_raster_pre_snap_triangles 1
+#define GL_CONSERVATIVE_RASTER_MODE_NV    0x954D
+#define GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV 0x954E
+#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV 0x954F
+typedef void (APIENTRYP PFNGLCONSERVATIVERASTERPARAMETERINVPROC) (GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConservativeRasterParameteriNV (GLenum pname, GLint param);
+#endif
+#endif /* GL_NV_conservative_raster_pre_snap_triangles */
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
+#endif /* GL_NV_copy_depth_to_color */
+
+#ifndef GL_NV_copy_image
+#define GL_NV_copy_image 1
+typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyImageSubDataNV (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+#endif /* GL_NV_copy_image */
+
+#ifndef GL_NV_deep_texture3D
+#define GL_NV_deep_texture3D 1
+#define GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV 0x90D0
+#define GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV   0x90D1
+#endif /* GL_NV_deep_texture3D */
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_NV_depth_buffer_float 1
+#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
+#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
+#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
+typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthRangedNV (GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glClearDepthdNV (GLdouble depth);
+GLAPI void APIENTRY glDepthBoundsdNV (GLdouble zmin, GLdouble zmax);
+#endif
+#endif /* GL_NV_depth_buffer_float */
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+#define GL_DEPTH_CLAMP_NV                 0x864F
+#endif /* GL_NV_depth_clamp */
+
+#ifndef GL_NV_draw_texture
+#define GL_NV_draw_texture 1
+typedef void (APIENTRYP PFNGLDRAWTEXTURENVPROC) (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawTextureNV (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+#endif
+#endif /* GL_NV_draw_texture */
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+#define GL_EVAL_2D_NV                     0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
+#define GL_MAP_TESSELLATION_NV            0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
+typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points);
+typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void *points);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points);
+GLAPI void APIENTRY glMapParameterivNV (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMapParameterfvNV (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void *points);
+GLAPI void APIENTRY glGetMapParameterivNV (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapParameterfvNV (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum target, GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glEvalMapsNV (GLenum target, GLenum mode);
+#endif
+#endif /* GL_NV_evaluators */
+
+#ifndef GL_NV_explicit_multisample
+#define GL_NV_explicit_multisample 1
+#define GL_SAMPLE_POSITION_NV             0x8E50
+#define GL_SAMPLE_MASK_NV                 0x8E51
+#define GL_SAMPLE_MASK_VALUE_NV           0x8E52
+#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
+#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
+#define GL_TEXTURE_RENDERBUFFER_NV        0x8E55
+#define GL_SAMPLER_RENDERBUFFER_NV        0x8E56
+#define GL_INT_SAMPLER_RENDERBUFFER_NV    0x8E57
+#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
+#define GL_MAX_SAMPLE_MASK_WORDS_NV       0x8E59
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
+typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetMultisamplefvNV (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint index, GLbitfield mask);
+GLAPI void APIENTRY glTexRenderbufferNV (GLenum target, GLuint renderbuffer);
+#endif
+#endif /* GL_NV_explicit_multisample */
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#define GL_ALL_COMPLETED_NV               0x84F2
+#define GL_FENCE_STATUS_NV                0x84F3
+#define GL_FENCE_CONDITION_NV             0x84F4
+typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
+GLAPI GLboolean APIENTRY glIsFenceNV (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceNV (GLuint fence);
+GLAPI void APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFinishFenceNV (GLuint fence);
+GLAPI void APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
+#endif
+#endif /* GL_NV_fence */
+
+#ifndef GL_NV_fill_rectangle
+#define GL_NV_fill_rectangle 1
+#define GL_FILL_RECTANGLE_NV              0x933C
+#endif /* GL_NV_fill_rectangle */
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+#define GL_FLOAT_R_NV                     0x8880
+#define GL_FLOAT_RG_NV                    0x8881
+#define GL_FLOAT_RGB_NV                   0x8882
+#define GL_FLOAT_RGBA_NV                  0x8883
+#define GL_FLOAT_R16_NV                   0x8884
+#define GL_FLOAT_R32_NV                   0x8885
+#define GL_FLOAT_RG16_NV                  0x8886
+#define GL_FLOAT_RG32_NV                  0x8887
+#define GL_FLOAT_RGB16_NV                 0x8888
+#define GL_FLOAT_RGB32_NV                 0x8889
+#define GL_FLOAT_RGBA16_NV                0x888A
+#define GL_FLOAT_RGBA32_NV                0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
+#define GL_FLOAT_RGBA_MODE_NV             0x888E
+#endif /* GL_NV_float_buffer */
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+#endif /* GL_NV_fog_distance */
+
+#ifndef GL_NV_fragment_coverage_to_color
+#define GL_NV_fragment_coverage_to_color 1
+#define GL_FRAGMENT_COVERAGE_TO_COLOR_NV  0x92DD
+#define GL_FRAGMENT_COVERAGE_COLOR_NV     0x92DE
+typedef void (APIENTRYP PFNGLFRAGMENTCOVERAGECOLORNVPROC) (GLuint color);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentCoverageColorNV (GLuint color);
+#endif
+#endif /* GL_NV_fragment_coverage_to_color */
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV            0x8870
+#define GL_MAX_TEXTURE_COORDS_NV          0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
+#define GL_PROGRAM_ERROR_STRING_NV        0x8874
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif
+#endif /* GL_NV_fragment_program */
+
+#ifndef GL_NV_fragment_program2
+#define GL_NV_fragment_program2 1
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
+#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
+#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
+#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
+#endif /* GL_NV_fragment_program2 */
+
+#ifndef GL_NV_fragment_program4
+#define GL_NV_fragment_program4 1
+#endif /* GL_NV_fragment_program4 */
+
+#ifndef GL_NV_fragment_program_option
+#define GL_NV_fragment_program_option 1
+#endif /* GL_NV_fragment_program_option */
+
+#ifndef GL_NV_fragment_shader_interlock
+#define GL_NV_fragment_shader_interlock 1
+#endif /* GL_NV_fragment_shader_interlock */
+
+#ifndef GL_NV_framebuffer_mixed_samples
+#define GL_NV_framebuffer_mixed_samples 1
+#define GL_COVERAGE_MODULATION_TABLE_NV   0x9331
+#define GL_COLOR_SAMPLES_NV               0x8E20
+#define GL_DEPTH_SAMPLES_NV               0x932D
+#define GL_STENCIL_SAMPLES_NV             0x932E
+#define GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV 0x932F
+#define GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV 0x9330
+#define GL_COVERAGE_MODULATION_NV         0x9332
+#define GL_COVERAGE_MODULATION_TABLE_SIZE_NV 0x9333
+typedef void (APIENTRYP PFNGLCOVERAGEMODULATIONTABLENVPROC) (GLsizei n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLGETCOVERAGEMODULATIONTABLENVPROC) (GLsizei bufsize, GLfloat *v);
+typedef void (APIENTRYP PFNGLCOVERAGEMODULATIONNVPROC) (GLenum components);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCoverageModulationTableNV (GLsizei n, const GLfloat *v);
+GLAPI void APIENTRY glGetCoverageModulationTableNV (GLsizei bufsize, GLfloat *v);
+GLAPI void APIENTRY glCoverageModulationNV (GLenum components);
+#endif
+#endif /* GL_NV_framebuffer_mixed_samples */
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_NV_framebuffer_multisample_coverage 1
+#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
+#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
+#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
+#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_NV_framebuffer_multisample_coverage */
+
+#ifndef GL_NV_geometry_program4
+#define GL_NV_geometry_program4 1
+#define GL_GEOMETRY_PROGRAM_NV            0x8C26
+#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
+#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
+typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramVertexLimitNV (GLenum target, GLint limit);
+GLAPI void APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+#endif /* GL_NV_geometry_program4 */
+
+#ifndef GL_NV_geometry_shader4
+#define GL_NV_geometry_shader4 1
+#endif /* GL_NV_geometry_shader4 */
+
+#ifndef GL_NV_geometry_shader_passthrough
+#define GL_NV_geometry_shader_passthrough 1
+#endif /* GL_NV_geometry_shader_passthrough */
+
+#ifndef GL_NV_gpu_program4
+#define GL_NV_gpu_program4 1
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
+#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
+#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
+#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
+#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
+#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
+#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+#endif
+#endif /* GL_NV_gpu_program4 */
+
+#ifndef GL_NV_gpu_program5
+#define GL_NV_gpu_program5 1
+#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C
+#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5F
+#define GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV 0x8F44
+#define GL_MAX_PROGRAM_SUBROUTINE_NUM_NV  0x8F45
+typedef void (APIENTRYP PFNGLPROGRAMSUBROUTINEPARAMETERSUIVNVPROC) (GLenum target, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSUBROUTINEPARAMETERUIVNVPROC) (GLenum target, GLuint index, GLuint *param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramSubroutineParametersuivNV (GLenum target, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetProgramSubroutineParameteruivNV (GLenum target, GLuint index, GLuint *param);
+#endif
+#endif /* GL_NV_gpu_program5 */
+
+#ifndef GL_NV_gpu_program5_mem_extended
+#define GL_NV_gpu_program5_mem_extended 1
+#endif /* GL_NV_gpu_program5_mem_extended */
+
+#ifndef GL_NV_gpu_shader5
+#define GL_NV_gpu_shader5 1
+#endif /* GL_NV_gpu_shader5 */
+
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+typedef unsigned short GLhalfNV;
+#define GL_HALF_FLOAT_NV                  0x140B
+typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
+typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex3hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex4hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glNormal3hNV (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor4hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV s);
+GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum target, GLhalfNV s);
+GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum target, GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
+GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x);
+GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib3hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib4hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+#endif
+#endif /* GL_NV_half_float */
+
+#ifndef GL_NV_internalformat_sample_query
+#define GL_NV_internalformat_sample_query 1
+#define GL_MULTISAMPLES_NV                0x9371
+#define GL_SUPERSAMPLE_SCALE_X_NV         0x9372
+#define GL_SUPERSAMPLE_SCALE_Y_NV         0x9373
+#define GL_CONFORMANT_NV                  0x9374
+typedef void (APIENTRYP PFNGLGETINTERNALFORMATSAMPLEIVNVPROC) (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetInternalformatSampleivNV (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint *params);
+#endif
+#endif /* GL_NV_internalformat_sample_query */
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#endif /* GL_NV_light_max_exponent */
+
+#ifndef GL_NV_multisample_coverage
+#define GL_NV_multisample_coverage 1
+#endif /* GL_NV_multisample_coverage */
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
+#endif /* GL_NV_multisample_filter_hint */
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+#define GL_PIXEL_COUNTER_BITS_NV          0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
+#define GL_PIXEL_COUNT_NV                 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
+typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glEndOcclusionQueryNV (void);
+GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint id, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_NV_occlusion_query */
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+#define GL_DEPTH_STENCIL_NV               0x84F9
+#define GL_UNSIGNED_INT_24_8_NV           0x84FA
+#endif /* GL_NV_packed_depth_stencil */
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_NV_parameter_buffer_object 1
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
+#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
+#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
+#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLuint *params);
+#endif
+#endif /* GL_NV_parameter_buffer_object */
+
+#ifndef GL_NV_parameter_buffer_object2
+#define GL_NV_parameter_buffer_object2 1
+#endif /* GL_NV_parameter_buffer_object2 */
+
+#ifndef GL_NV_path_rendering
+#define GL_NV_path_rendering 1
+#define GL_PATH_FORMAT_SVG_NV             0x9070
+#define GL_PATH_FORMAT_PS_NV              0x9071
+#define GL_STANDARD_FONT_NAME_NV          0x9072
+#define GL_SYSTEM_FONT_NAME_NV            0x9073
+#define GL_FILE_NAME_NV                   0x9074
+#define GL_PATH_STROKE_WIDTH_NV           0x9075
+#define GL_PATH_END_CAPS_NV               0x9076
+#define GL_PATH_INITIAL_END_CAP_NV        0x9077
+#define GL_PATH_TERMINAL_END_CAP_NV       0x9078
+#define GL_PATH_JOIN_STYLE_NV             0x9079
+#define GL_PATH_MITER_LIMIT_NV            0x907A
+#define GL_PATH_DASH_CAPS_NV              0x907B
+#define GL_PATH_INITIAL_DASH_CAP_NV       0x907C
+#define GL_PATH_TERMINAL_DASH_CAP_NV      0x907D
+#define GL_PATH_DASH_OFFSET_NV            0x907E
+#define GL_PATH_CLIENT_LENGTH_NV          0x907F
+#define GL_PATH_FILL_MODE_NV              0x9080
+#define GL_PATH_FILL_MASK_NV              0x9081
+#define GL_PATH_FILL_COVER_MODE_NV        0x9082
+#define GL_PATH_STROKE_COVER_MODE_NV      0x9083
+#define GL_PATH_STROKE_MASK_NV            0x9084
+#define GL_COUNT_UP_NV                    0x9088
+#define GL_COUNT_DOWN_NV                  0x9089
+#define GL_PATH_OBJECT_BOUNDING_BOX_NV    0x908A
+#define GL_CONVEX_HULL_NV                 0x908B
+#define GL_BOUNDING_BOX_NV                0x908D
+#define GL_TRANSLATE_X_NV                 0x908E
+#define GL_TRANSLATE_Y_NV                 0x908F
+#define GL_TRANSLATE_2D_NV                0x9090
+#define GL_TRANSLATE_3D_NV                0x9091
+#define GL_AFFINE_2D_NV                   0x9092
+#define GL_AFFINE_3D_NV                   0x9094
+#define GL_TRANSPOSE_AFFINE_2D_NV         0x9096
+#define GL_TRANSPOSE_AFFINE_3D_NV         0x9098
+#define GL_UTF8_NV                        0x909A
+#define GL_UTF16_NV                       0x909B
+#define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C
+#define GL_PATH_COMMAND_COUNT_NV          0x909D
+#define GL_PATH_COORD_COUNT_NV            0x909E
+#define GL_PATH_DASH_ARRAY_COUNT_NV       0x909F
+#define GL_PATH_COMPUTED_LENGTH_NV        0x90A0
+#define GL_PATH_FILL_BOUNDING_BOX_NV      0x90A1
+#define GL_PATH_STROKE_BOUNDING_BOX_NV    0x90A2
+#define GL_SQUARE_NV                      0x90A3
+#define GL_ROUND_NV                       0x90A4
+#define GL_TRIANGULAR_NV                  0x90A5
+#define GL_BEVEL_NV                       0x90A6
+#define GL_MITER_REVERT_NV                0x90A7
+#define GL_MITER_TRUNCATE_NV              0x90A8
+#define GL_SKIP_MISSING_GLYPH_NV          0x90A9
+#define GL_USE_MISSING_GLYPH_NV           0x90AA
+#define GL_PATH_ERROR_POSITION_NV         0x90AB
+#define GL_ACCUM_ADJACENT_PAIRS_NV        0x90AD
+#define GL_ADJACENT_PAIRS_NV              0x90AE
+#define GL_FIRST_TO_REST_NV               0x90AF
+#define GL_PATH_GEN_MODE_NV               0x90B0
+#define GL_PATH_GEN_COEFF_NV              0x90B1
+#define GL_PATH_GEN_COMPONENTS_NV         0x90B3
+#define GL_PATH_STENCIL_FUNC_NV           0x90B7
+#define GL_PATH_STENCIL_REF_NV            0x90B8
+#define GL_PATH_STENCIL_VALUE_MASK_NV     0x90B9
+#define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD
+#define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE
+#define GL_PATH_COVER_DEPTH_FUNC_NV       0x90BF
+#define GL_PATH_DASH_OFFSET_RESET_NV      0x90B4
+#define GL_MOVE_TO_RESETS_NV              0x90B5
+#define GL_MOVE_TO_CONTINUES_NV           0x90B6
+#define GL_CLOSE_PATH_NV                  0x00
+#define GL_MOVE_TO_NV                     0x02
+#define GL_RELATIVE_MOVE_TO_NV            0x03
+#define GL_LINE_TO_NV                     0x04
+#define GL_RELATIVE_LINE_TO_NV            0x05
+#define GL_HORIZONTAL_LINE_TO_NV          0x06
+#define GL_RELATIVE_HORIZONTAL_LINE_TO_NV 0x07
+#define GL_VERTICAL_LINE_TO_NV            0x08
+#define GL_RELATIVE_VERTICAL_LINE_TO_NV   0x09
+#define GL_QUADRATIC_CURVE_TO_NV          0x0A
+#define GL_RELATIVE_QUADRATIC_CURVE_TO_NV 0x0B
+#define GL_CUBIC_CURVE_TO_NV              0x0C
+#define GL_RELATIVE_CUBIC_CURVE_TO_NV     0x0D
+#define GL_SMOOTH_QUADRATIC_CURVE_TO_NV   0x0E
+#define GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0F
+#define GL_SMOOTH_CUBIC_CURVE_TO_NV       0x10
+#define GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV 0x11
+#define GL_SMALL_CCW_ARC_TO_NV            0x12
+#define GL_RELATIVE_SMALL_CCW_ARC_TO_NV   0x13
+#define GL_SMALL_CW_ARC_TO_NV             0x14
+#define GL_RELATIVE_SMALL_CW_ARC_TO_NV    0x15
+#define GL_LARGE_CCW_ARC_TO_NV            0x16
+#define GL_RELATIVE_LARGE_CCW_ARC_TO_NV   0x17
+#define GL_LARGE_CW_ARC_TO_NV             0x18
+#define GL_RELATIVE_LARGE_CW_ARC_TO_NV    0x19
+#define GL_RESTART_PATH_NV                0xF0
+#define GL_DUP_FIRST_CUBIC_CURVE_TO_NV    0xF2
+#define GL_DUP_LAST_CUBIC_CURVE_TO_NV     0xF4
+#define GL_RECT_NV                        0xF6
+#define GL_CIRCULAR_CCW_ARC_TO_NV         0xF8
+#define GL_CIRCULAR_CW_ARC_TO_NV          0xFA
+#define GL_CIRCULAR_TANGENT_ARC_TO_NV     0xFC
+#define GL_ARC_TO_NV                      0xFE
+#define GL_RELATIVE_ARC_TO_NV             0xFF
+#define GL_BOLD_BIT_NV                    0x01
+#define GL_ITALIC_BIT_NV                  0x02
+#define GL_GLYPH_WIDTH_BIT_NV             0x01
+#define GL_GLYPH_HEIGHT_BIT_NV            0x02
+#define GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV 0x04
+#define GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV 0x08
+#define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10
+#define GL_GLYPH_VERTICAL_BEARING_X_BIT_NV 0x20
+#define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40
+#define GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV 0x80
+#define GL_GLYPH_HAS_KERNING_BIT_NV       0x100
+#define GL_FONT_X_MIN_BOUNDS_BIT_NV       0x00010000
+#define GL_FONT_Y_MIN_BOUNDS_BIT_NV       0x00020000
+#define GL_FONT_X_MAX_BOUNDS_BIT_NV       0x00040000
+#define GL_FONT_Y_MAX_BOUNDS_BIT_NV       0x00080000
+#define GL_FONT_UNITS_PER_EM_BIT_NV       0x00100000
+#define GL_FONT_ASCENDER_BIT_NV           0x00200000
+#define GL_FONT_DESCENDER_BIT_NV          0x00400000
+#define GL_FONT_HEIGHT_BIT_NV             0x00800000
+#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV  0x01000000
+#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000
+#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000
+#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000
+#define GL_FONT_HAS_KERNING_BIT_NV        0x10000000
+#define GL_ROUNDED_RECT_NV                0xE8
+#define GL_RELATIVE_ROUNDED_RECT_NV       0xE9
+#define GL_ROUNDED_RECT2_NV               0xEA
+#define GL_RELATIVE_ROUNDED_RECT2_NV      0xEB
+#define GL_ROUNDED_RECT4_NV               0xEC
+#define GL_RELATIVE_ROUNDED_RECT4_NV      0xED
+#define GL_ROUNDED_RECT8_NV               0xEE
+#define GL_RELATIVE_ROUNDED_RECT8_NV      0xEF
+#define GL_RELATIVE_RECT_NV               0xF7
+#define GL_FONT_GLYPHS_AVAILABLE_NV       0x9368
+#define GL_FONT_TARGET_UNAVAILABLE_NV     0x9369
+#define GL_FONT_UNAVAILABLE_NV            0x936A
+#define GL_FONT_UNINTELLIGIBLE_NV         0x936B
+#define GL_CONIC_CURVE_TO_NV              0x1A
+#define GL_RELATIVE_CONIC_CURVE_TO_NV     0x1B
+#define GL_FONT_NUM_GLYPH_INDICES_BIT_NV  0x20000000
+#define GL_STANDARD_FONT_FORMAT_NV        0x936C
+#define GL_2_BYTES_NV                     0x1407
+#define GL_3_BYTES_NV                     0x1408
+#define GL_4_BYTES_NV                     0x1409
+#define GL_EYE_LINEAR_NV                  0x2400
+#define GL_OBJECT_LINEAR_NV               0x2401
+#define GL_CONSTANT_NV                    0x8576
+#define GL_PATH_FOG_GEN_MODE_NV           0x90AC
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_PATH_GEN_COLOR_FORMAT_NV       0x90B2
+#define GL_PATH_PROJECTION_NV             0x1701
+#define GL_PATH_MODELVIEW_NV              0x1700
+#define GL_PATH_MODELVIEW_STACK_DEPTH_NV  0x0BA3
+#define GL_PATH_MODELVIEW_MATRIX_NV       0x0BA6
+#define GL_PATH_MAX_MODELVIEW_STACK_DEPTH_NV 0x0D36
+#define GL_PATH_TRANSPOSE_MODELVIEW_MATRIX_NV 0x84E3
+#define GL_PATH_PROJECTION_STACK_DEPTH_NV 0x0BA4
+#define GL_PATH_PROJECTION_MATRIX_NV      0x0BA7
+#define GL_PATH_MAX_PROJECTION_STACK_DEPTH_NV 0x0D38
+#define GL_PATH_TRANSPOSE_PROJECTION_MATRIX_NV 0x84E4
+#define GL_FRAGMENT_INPUT_NV              0x936D
+typedef GLuint (APIENTRYP PFNGLGENPATHSNVPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEPATHSNVPROC) (GLuint path, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISPATHNVPROC) (GLuint path);
+typedef void (APIENTRYP PFNGLPATHCOMMANDSNVPROC) (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHCOORDSNVPROC) (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSUBCOMMANDSNVPROC) (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSUBCOORDSNVPROC) (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSTRINGNVPROC) (GLuint path, GLenum format, GLsizei length, const void *pathString);
+typedef void (APIENTRYP PFNGLPATHGLYPHSNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (APIENTRYP PFNGLPATHGLYPHRANGENVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (APIENTRYP PFNGLWEIGHTPATHSNVPROC) (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLCOPYPATHNVPROC) (GLuint resultPath, GLuint srcPath);
+typedef void (APIENTRYP PFNGLINTERPOLATEPATHSNVPROC) (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
+typedef void (APIENTRYP PFNGLTRANSFORMPATHNVPROC) (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, const GLint *value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERINVPROC) (GLuint path, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERFNVPROC) (GLuint path, GLenum pname, GLfloat value);
+typedef void (APIENTRYP PFNGLPATHDASHARRAYNVPROC) (GLuint path, GLsizei dashCount, const GLfloat *dashArray);
+typedef void (APIENTRYP PFNGLPATHSTENCILFUNCNVPROC) (GLenum func, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLPATHSTENCILDEPTHOFFSETNVPROC) (GLfloat factor, GLfloat units);
+typedef void (APIENTRYP PFNGLSTENCILFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLPATHCOVERDEPTHFUNCNVPROC) (GLenum func);
+typedef void (APIENTRYP PFNGLCOVERFILLPATHNVPROC) (GLuint path, GLenum coverMode);
+typedef void (APIENTRYP PFNGLCOVERSTROKEPATHNVPROC) (GLuint path, GLenum coverMode);
+typedef void (APIENTRYP PFNGLCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLGETPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, GLfloat *value);
+typedef void (APIENTRYP PFNGLGETPATHCOMMANDSNVPROC) (GLuint path, GLubyte *commands);
+typedef void (APIENTRYP PFNGLGETPATHCOORDSNVPROC) (GLuint path, GLfloat *coords);
+typedef void (APIENTRYP PFNGLGETPATHDASHARRAYNVPROC) (GLuint path, GLfloat *dashArray);
+typedef void (APIENTRYP PFNGLGETPATHMETRICSNVPROC) (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
+typedef void (APIENTRYP PFNGLGETPATHMETRICRANGENVPROC) (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
+typedef void (APIENTRYP PFNGLGETPATHSPACINGNVPROC) (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
+typedef GLboolean (APIENTRYP PFNGLISPOINTINFILLPATHNVPROC) (GLuint path, GLuint mask, GLfloat x, GLfloat y);
+typedef GLboolean (APIENTRYP PFNGLISPOINTINSTROKEPATHNVPROC) (GLuint path, GLfloat x, GLfloat y);
+typedef GLfloat (APIENTRYP PFNGLGETPATHLENGTHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments);
+typedef GLboolean (APIENTRYP PFNGLPOINTALONGPATHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
+typedef void (APIENTRYP PFNGLMATRIXLOAD3X2FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOAD3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULT3X2FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULT3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask, GLenum coverMode);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXRANGENVPROC) (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2]);
+typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef GLenum (APIENTRYP PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
+typedef void (APIENTRYP PFNGLPATHCOLORGENNVPROC) (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLPATHTEXGENNVPROC) (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLPATHFOGGENNVPROC) (GLenum genMode);
+typedef void (APIENTRYP PFNGLGETPATHCOLORGENIVNVPROC) (GLenum color, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHCOLORGENFVNVPROC) (GLenum color, GLenum pname, GLfloat *value);
+typedef void (APIENTRYP PFNGLGETPATHTEXGENIVNVPROC) (GLenum texCoordSet, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHTEXGENFVNVPROC) (GLenum texCoordSet, GLenum pname, GLfloat *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenPathsNV (GLsizei range);
+GLAPI void APIENTRY glDeletePathsNV (GLuint path, GLsizei range);
+GLAPI GLboolean APIENTRY glIsPathNV (GLuint path);
+GLAPI void APIENTRY glPathCommandsNV (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathCoordsNV (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathSubCommandsNV (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathSubCoordsNV (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathStringNV (GLuint path, GLenum format, GLsizei length, const void *pathString);
+GLAPI void APIENTRY glPathGlyphsNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI void APIENTRY glPathGlyphRangeNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI void APIENTRY glWeightPathsNV (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights);
+GLAPI void APIENTRY glCopyPathNV (GLuint resultPath, GLuint srcPath);
+GLAPI void APIENTRY glInterpolatePathsNV (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
+GLAPI void APIENTRY glTransformPathNV (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glPathParameterivNV (GLuint path, GLenum pname, const GLint *value);
+GLAPI void APIENTRY glPathParameteriNV (GLuint path, GLenum pname, GLint value);
+GLAPI void APIENTRY glPathParameterfvNV (GLuint path, GLenum pname, const GLfloat *value);
+GLAPI void APIENTRY glPathParameterfNV (GLuint path, GLenum pname, GLfloat value);
+GLAPI void APIENTRY glPathDashArrayNV (GLuint path, GLsizei dashCount, const GLfloat *dashArray);
+GLAPI void APIENTRY glPathStencilFuncNV (GLenum func, GLint ref, GLuint mask);
+GLAPI void APIENTRY glPathStencilDepthOffsetNV (GLfloat factor, GLfloat units);
+GLAPI void APIENTRY glStencilFillPathNV (GLuint path, GLenum fillMode, GLuint mask);
+GLAPI void APIENTRY glStencilStrokePathNV (GLuint path, GLint reference, GLuint mask);
+GLAPI void APIENTRY glStencilFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glStencilStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glPathCoverDepthFuncNV (GLenum func);
+GLAPI void APIENTRY glCoverFillPathNV (GLuint path, GLenum coverMode);
+GLAPI void APIENTRY glCoverStrokePathNV (GLuint path, GLenum coverMode);
+GLAPI void APIENTRY glCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glCoverStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glGetPathParameterivNV (GLuint path, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathParameterfvNV (GLuint path, GLenum pname, GLfloat *value);
+GLAPI void APIENTRY glGetPathCommandsNV (GLuint path, GLubyte *commands);
+GLAPI void APIENTRY glGetPathCoordsNV (GLuint path, GLfloat *coords);
+GLAPI void APIENTRY glGetPathDashArrayNV (GLuint path, GLfloat *dashArray);
+GLAPI void APIENTRY glGetPathMetricsNV (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
+GLAPI void APIENTRY glGetPathMetricRangeNV (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
+GLAPI void APIENTRY glGetPathSpacingNV (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
+GLAPI GLboolean APIENTRY glIsPointInFillPathNV (GLuint path, GLuint mask, GLfloat x, GLfloat y);
+GLAPI GLboolean APIENTRY glIsPointInStrokePathNV (GLuint path, GLfloat x, GLfloat y);
+GLAPI GLfloat APIENTRY glGetPathLengthNV (GLuint path, GLsizei startSegment, GLsizei numSegments);
+GLAPI GLboolean APIENTRY glPointAlongPathNV (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
+GLAPI void APIENTRY glMatrixLoad3x2fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoad3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoadTranspose3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMult3x2fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMult3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultTranspose3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glStencilThenCoverFillPathNV (GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode);
+GLAPI void APIENTRY glStencilThenCoverStrokePathNV (GLuint path, GLint reference, GLuint mask, GLenum coverMode);
+GLAPI void APIENTRY glStencilThenCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glStencilThenCoverStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI GLenum APIENTRY glPathGlyphIndexRangeNV (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2]);
+GLAPI GLenum APIENTRY glPathGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI GLenum APIENTRY glPathMemoryGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI void APIENTRY glProgramPathFragmentInputGenNV (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
+GLAPI void APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
+GLAPI void APIENTRY glPathColorGenNV (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
+GLAPI void APIENTRY glPathTexGenNV (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
+GLAPI void APIENTRY glPathFogGenNV (GLenum genMode);
+GLAPI void APIENTRY glGetPathColorGenivNV (GLenum color, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathColorGenfvNV (GLenum color, GLenum pname, GLfloat *value);
+GLAPI void APIENTRY glGetPathTexGenivNV (GLenum texCoordSet, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathTexGenfvNV (GLenum texCoordSet, GLenum pname, GLfloat *value);
+#endif
+#endif /* GL_NV_path_rendering */
+
+#ifndef GL_NV_path_rendering_shared_edge
+#define GL_NV_path_rendering_shared_edge 1
+#define GL_SHARED_EDGE_NV                 0xC0
+#endif /* GL_NV_path_rendering_shared_edge */
+
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, const void *pointer);
+typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, const void *pointer);
+GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target);
+#endif
+#endif /* GL_NV_pixel_data_range */
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+#define GL_POINT_SPRITE_NV                0x8861
+#define GL_COORD_REPLACE_NV               0x8862
+#define GL_POINT_SPRITE_R_MODE_NV         0x8863
+typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameterivNV (GLenum pname, const GLint *params);
+#endif
+#endif /* GL_NV_point_sprite */
+
+#ifndef GL_NV_present_video
+#define GL_NV_present_video 1
+#define GL_FRAME_NV                       0x8E26
+#define GL_FIELDS_NV                      0x8E27
+#define GL_CURRENT_TIME_NV                0x8E28
+#define GL_NUM_FILL_STREAMS_NV            0x8E29
+#define GL_PRESENT_TIME_NV                0x8E2A
+#define GL_PRESENT_DURATION_NV            0x8E2B
+typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+GLAPI void APIENTRY glGetVideoivNV (GLuint video_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideouivNV (GLuint video_slot, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glGetVideoi64vNV (GLuint video_slot, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetVideoui64vNV (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#endif
+#endif /* GL_NV_present_video */
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+#define GL_PRIMITIVE_RESTART_NV           0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveRestartNV (void);
+GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index);
+#endif
+#endif /* GL_NV_primitive_restart */
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerParameterfvNV (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glCombinerParameterfNV (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glCombinerParameterivNV (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCombinerParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glCombinerInputNV (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glCombinerOutputNV (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+GLAPI void APIENTRY glFinalCombinerInputNV (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum variable, GLenum pname, GLint *params);
+#endif
+#endif /* GL_NV_register_combiners */
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+#define GL_PER_STAGE_CONSTANTS_NV         0x8535
+typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum stage, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_NV_register_combiners2 */
+
+#ifndef GL_NV_robustness_video_memory_purge
+#define GL_NV_robustness_video_memory_purge 1
+#define GL_PURGED_CONTEXT_RESET_NV        0x92BB
+#endif /* GL_NV_robustness_video_memory_purge */
+
+#ifndef GL_NV_sample_locations
+#define GL_NV_sample_locations 1
+#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV 0x933D
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV 0x933E
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV 0x933F
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV 0x9340
+#define GL_SAMPLE_LOCATION_NV             0x8E50
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9341
+#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV 0x9342
+#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV 0x9343
+typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLRESOLVEDEPTHVALUESNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferSampleLocationsfvNV (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glNamedFramebufferSampleLocationsfvNV (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glResolveDepthValuesNV (void);
+#endif
+#endif /* GL_NV_sample_locations */
+
+#ifndef GL_NV_sample_mask_override_coverage
+#define GL_NV_sample_mask_override_coverage 1
+#endif /* GL_NV_sample_mask_override_coverage */
+
+#ifndef GL_NV_shader_atomic_counters
+#define GL_NV_shader_atomic_counters 1
+#endif /* GL_NV_shader_atomic_counters */
+
+#ifndef GL_NV_shader_atomic_float
+#define GL_NV_shader_atomic_float 1
+#endif /* GL_NV_shader_atomic_float */
+
+#ifndef GL_NV_shader_atomic_float64
+#define GL_NV_shader_atomic_float64 1
+#endif /* GL_NV_shader_atomic_float64 */
+
+#ifndef GL_NV_shader_atomic_fp16_vector
+#define GL_NV_shader_atomic_fp16_vector 1
+#endif /* GL_NV_shader_atomic_fp16_vector */
+
+#ifndef GL_NV_shader_atomic_int64
+#define GL_NV_shader_atomic_int64 1
+#endif /* GL_NV_shader_atomic_int64 */
+
+#ifndef GL_NV_shader_buffer_load
+#define GL_NV_shader_buffer_load 1
+#define GL_BUFFER_GPU_ADDRESS_NV          0x8F1D
+#define GL_GPU_ADDRESS_NV                 0x8F34
+#define GL_MAX_SHADER_BUFFER_ADDRESS_NV   0x8F35
+typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result);
+typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access);
+GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target);
+GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target);
+GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access);
+GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer);
+GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer);
+GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result);
+GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif
+#endif /* GL_NV_shader_buffer_load */
+
+#ifndef GL_NV_shader_buffer_store
+#define GL_NV_shader_buffer_store 1
+#define GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV 0x00000010
+#endif /* GL_NV_shader_buffer_store */
+
+#ifndef GL_NV_shader_storage_buffer_object
+#define GL_NV_shader_storage_buffer_object 1
+#endif /* GL_NV_shader_storage_buffer_object */
+
+#ifndef GL_NV_shader_thread_group
+#define GL_NV_shader_thread_group 1
+#define GL_WARP_SIZE_NV                   0x9339
+#define GL_WARPS_PER_SM_NV                0x933A
+#define GL_SM_COUNT_NV                    0x933B
+#endif /* GL_NV_shader_thread_group */
+
+#ifndef GL_NV_shader_thread_shuffle
+#define GL_NV_shader_thread_shuffle 1
+#endif /* GL_NV_shader_thread_shuffle */
+
+#ifndef GL_NV_stereo_view_rendering
+#define GL_NV_stereo_view_rendering 1
+#endif /* GL_NV_stereo_view_rendering */
+
+#ifndef GL_NV_tessellation_program5
+#define GL_NV_tessellation_program5 1
+#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV   0x86D8
+#define GL_TESS_CONTROL_PROGRAM_NV        0x891E
+#define GL_TESS_EVALUATION_PROGRAM_NV     0x891F
+#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74
+#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75
+#endif /* GL_NV_tessellation_program5 */
+
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#endif /* GL_NV_texgen_emboss */
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#endif /* GL_NV_texgen_reflection */
+
+#ifndef GL_NV_texture_barrier
+#define GL_NV_texture_barrier 1
+typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureBarrierNV (void);
+#endif
+#endif /* GL_NV_texture_barrier */
+
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+#endif /* GL_NV_texture_compression_vtc */
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#endif /* GL_NV_texture_env_combine4 */
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+#endif /* GL_NV_texture_expand_normal */
+
+#ifndef GL_NV_texture_multisample
+#define GL_NV_texture_multisample 1
+#define GL_TEXTURE_COVERAGE_SAMPLES_NV    0x9045
+#define GL_TEXTURE_COLOR_SAMPLES_NV       0x9046
+typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage2DMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTexImage3DMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage2DMultisampleNV (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage3DMultisampleNV (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage2DMultisampleCoverageNV (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage3DMultisampleCoverageNV (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+#endif
+#endif /* GL_NV_texture_multisample */
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+#define GL_TEXTURE_RECTANGLE_NV           0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
+#endif /* GL_NV_texture_rectangle */
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
+#define GL_SHADER_CONSISTENT_NV           0x86DD
+#define GL_TEXTURE_SHADER_NV              0x86DE
+#define GL_SHADER_OPERATION_NV            0x86DF
+#define GL_CULL_MODES_NV                  0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
+#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    0x86E1
+#define GL_OFFSET_TEXTURE_2D_SCALE_NV     0x86E2
+#define GL_OFFSET_TEXTURE_2D_BIAS_NV      0x86E3
+#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
+#define GL_CONST_EYE_NV                   0x86E5
+#define GL_PASS_THROUGH_NV                0x86E6
+#define GL_CULL_FRAGMENT_NV               0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
+#define GL_DOT_PRODUCT_NV                 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV                        0x86F4
+#define GL_DSDT_NV                        0x86F5
+#define GL_DSDT_MAG_NV                    0x86F6
+#define GL_DSDT_MAG_VIB_NV                0x86F7
+#define GL_HILO16_NV                      0x86F8
+#define GL_SIGNED_HILO_NV                 0x86F9
+#define GL_SIGNED_HILO16_NV               0x86FA
+#define GL_SIGNED_RGBA_NV                 0x86FB
+#define GL_SIGNED_RGBA8_NV                0x86FC
+#define GL_SIGNED_RGB_NV                  0x86FE
+#define GL_SIGNED_RGB8_NV                 0x86FF
+#define GL_SIGNED_LUMINANCE_NV            0x8701
+#define GL_SIGNED_LUMINANCE8_NV           0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
+#define GL_SIGNED_ALPHA_NV                0x8705
+#define GL_SIGNED_ALPHA8_NV               0x8706
+#define GL_SIGNED_INTENSITY_NV            0x8707
+#define GL_SIGNED_INTENSITY8_NV           0x8708
+#define GL_DSDT8_NV                       0x8709
+#define GL_DSDT8_MAG8_NV                  0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV                    0x870E
+#define GL_LO_SCALE_NV                    0x870F
+#define GL_DS_SCALE_NV                    0x8710
+#define GL_DT_SCALE_NV                    0x8711
+#define GL_MAGNITUDE_SCALE_NV             0x8712
+#define GL_VIBRANCE_SCALE_NV              0x8713
+#define GL_HI_BIAS_NV                     0x8714
+#define GL_LO_BIAS_NV                     0x8715
+#define GL_DS_BIAS_NV                     0x8716
+#define GL_DT_BIAS_NV                     0x8717
+#define GL_MAGNITUDE_BIAS_NV              0x8718
+#define GL_VIBRANCE_BIAS_NV               0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
+#define GL_TEXTURE_HI_SIZE_NV             0x871B
+#define GL_TEXTURE_LO_SIZE_NV             0x871C
+#define GL_TEXTURE_DS_SIZE_NV             0x871D
+#define GL_TEXTURE_DT_SIZE_NV             0x871E
+#define GL_TEXTURE_MAG_SIZE_NV            0x871F
+#endif /* GL_NV_texture_shader */
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
+#endif /* GL_NV_texture_shader2 */
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV                       0x885E
+#define GL_SIGNED_HILO8_NV                0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
+#endif /* GL_NV_texture_shader3 */
+
+#ifndef GL_NV_transform_feedback
+#define GL_NV_transform_feedback 1
+#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
+#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
+#define GL_TEXTURE_COORD_NV               0x8C79
+#define GL_CLIP_DISTANCE_NV               0x8C7A
+#define GL_VERTEX_ID_NV                   0x8C7B
+#define GL_PRIMITIVE_ID_NV                0x8C7C
+#define GL_GENERIC_ATTRIB_NV              0x8C7D
+#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
+#define GL_ACTIVE_VARYINGS_NV             0x8C81
+#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
+#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
+#define GL_PRIMITIVES_GENERATED_NV        0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
+#define GL_RASTERIZER_DISCARD_NV          0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
+#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
+#define GL_LAYER_NV                       0x8DAA
+#define GL_NEXT_BUFFER_NV                 -2
+#define GL_SKIP_COMPONENTS4_NV            -3
+#define GL_SKIP_COMPONENTS3_NV            -4
+#define GL_SKIP_COMPONENTS2_NV            -5
+#define GL_SKIP_COMPONENTS1_NV            -6
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKSTREAMATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackNV (void);
+GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLsizei count, const GLint *attribs, GLenum bufferMode);
+GLAPI void APIENTRY glBindBufferRangeNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseNV (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+GLAPI void APIENTRY glActiveVaryingNV (GLuint program, const GLchar *name);
+GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetActiveVaryingNV (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint program, GLuint index, GLint *location);
+GLAPI void APIENTRY glTransformFeedbackStreamAttribsNV (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
+#endif
+#endif /* GL_NV_transform_feedback */
+
+#ifndef GL_NV_transform_feedback2
+#define GL_NV_transform_feedback2 1
+#define GL_TRANSFORM_FEEDBACK_NV          0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING_NV  0x8E25
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedbackNV (void);
+GLAPI void APIENTRY glResumeTransformFeedbackNV (void);
+GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id);
+#endif
+#endif /* GL_NV_transform_feedback2 */
+
+#ifndef GL_NV_uniform_buffer_unified_memory
+#define GL_NV_uniform_buffer_unified_memory 1
+#define GL_UNIFORM_BUFFER_UNIFIED_NV      0x936E
+#define GL_UNIFORM_BUFFER_ADDRESS_NV      0x936F
+#define GL_UNIFORM_BUFFER_LENGTH_NV       0x9370
+#endif /* GL_NV_uniform_buffer_unified_memory */
+
+#ifndef GL_NV_vdpau_interop
+#define GL_NV_vdpau_interop 1
+typedef GLintptr GLvdpauSurfaceNV;
+#define GL_SURFACE_STATE_NV               0x86EB
+#define GL_SURFACE_REGISTERED_NV          0x86FD
+#define GL_SURFACE_MAPPED_NV              0x8700
+#define GL_WRITE_DISCARD_NV               0x88BE
+typedef void (APIENTRYP PFNGLVDPAUINITNVPROC) (const void *vdpDevice, const void *getProcAddress);
+typedef void (APIENTRYP PFNGLVDPAUFININVPROC) (void);
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef GLboolean (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface);
+typedef void (APIENTRYP PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface);
+typedef void (APIENTRYP PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+typedef void (APIENTRYP PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access);
+typedef void (APIENTRYP PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
+typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVDPAUInitNV (const void *vdpDevice, const void *getProcAddress);
+GLAPI void APIENTRY glVDPAUFiniNV (void);
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterOutputSurfaceNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+GLAPI GLboolean APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface);
+GLAPI void APIENTRY glVDPAUUnregisterSurfaceNV (GLvdpauSurfaceNV surface);
+GLAPI void APIENTRY glVDPAUGetSurfaceivNV (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+GLAPI void APIENTRY glVDPAUSurfaceAccessNV (GLvdpauSurfaceNV surface, GLenum access);
+GLAPI void APIENTRY glVDPAUMapSurfacesNV (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
+GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
+#endif
+#endif /* GL_NV_vdpau_interop */
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
+GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei length, const void *pointer);
+#endif
+#endif /* GL_NV_vertex_array_range */
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+#endif /* GL_NV_vertex_array_range2 */
+
+#ifndef GL_NV_vertex_attrib_integer_64bit
+#define GL_NV_vertex_attrib_integer_64bit 1
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribL1i64NV (GLuint index, GLint64EXT x);
+GLAPI void APIENTRY glVertexAttribL2i64NV (GLuint index, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glVertexAttribL3i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glVertexAttribL4i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glVertexAttribL1i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL2i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL3i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL4i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL1ui64NV (GLuint index, GLuint64EXT x);
+GLAPI void APIENTRY glVertexAttribL2ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glVertexAttribL3ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glVertexAttribL4ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glVertexAttribL1ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL2ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL3ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL4ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glGetVertexAttribLi64vNV (GLuint index, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetVertexAttribLui64vNV (GLuint index, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glVertexAttribLFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
+#endif
+#endif /* GL_NV_vertex_attrib_integer_64bit */
+
+#ifndef GL_NV_vertex_buffer_unified_memory
+#define GL_NV_vertex_buffer_unified_memory 1
+#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E
+#define GL_ELEMENT_ARRAY_UNIFIED_NV       0x8F1F
+#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20
+#define GL_VERTEX_ARRAY_ADDRESS_NV        0x8F21
+#define GL_NORMAL_ARRAY_ADDRESS_NV        0x8F22
+#define GL_COLOR_ARRAY_ADDRESS_NV         0x8F23
+#define GL_INDEX_ARRAY_ADDRESS_NV         0x8F24
+#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25
+#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV     0x8F26
+#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
+#define GL_FOG_COORD_ARRAY_ADDRESS_NV     0x8F28
+#define GL_ELEMENT_ARRAY_ADDRESS_NV       0x8F29
+#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV  0x8F2A
+#define GL_VERTEX_ARRAY_LENGTH_NV         0x8F2B
+#define GL_NORMAL_ARRAY_LENGTH_NV         0x8F2C
+#define GL_COLOR_ARRAY_LENGTH_NV          0x8F2D
+#define GL_INDEX_ARRAY_LENGTH_NV          0x8F2E
+#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV  0x8F2F
+#define GL_EDGE_FLAG_ARRAY_LENGTH_NV      0x8F30
+#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31
+#define GL_FOG_COORD_ARRAY_LENGTH_NV      0x8F32
+#define GL_ELEMENT_ARRAY_LENGTH_NV        0x8F33
+#define GL_DRAW_INDIRECT_UNIFIED_NV       0x8F40
+#define GL_DRAW_INDIRECT_ADDRESS_NV       0x8F41
+#define GL_DRAW_INDIRECT_LENGTH_NV        0x8F42
+typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride);
+GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result);
+#endif
+#endif /* GL_NV_vertex_buffer_unified_memory */
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+#define GL_VERTEX_PROGRAM_NV              0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
+#define GL_CURRENT_ATTRIB_NV              0x8626
+#define GL_PROGRAM_LENGTH_NV              0x8627
+#define GL_PROGRAM_STRING_NV              0x8628
+#define GL_MODELVIEW_PROJECTION_NV        0x8629
+#define GL_IDENTITY_NV                    0x862A
+#define GL_INVERSE_NV                     0x862B
+#define GL_TRANSPOSE_NV                   0x862C
+#define GL_INVERSE_TRANSPOSE_NV           0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV          0x862F
+#define GL_MATRIX0_NV                     0x8630
+#define GL_MATRIX1_NV                     0x8631
+#define GL_MATRIX2_NV                     0x8632
+#define GL_MATRIX3_NV                     0x8633
+#define GL_MATRIX4_NV                     0x8634
+#define GL_MATRIX5_NV                     0x8635
+#define GL_MATRIX6_NV                     0x8636
+#define GL_MATRIX7_NV                     0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
+#define GL_CURRENT_MATRIX_NV              0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
+#define GL_PROGRAM_PARAMETER_NV           0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
+#define GL_PROGRAM_TARGET_NV              0x8646
+#define GL_PROGRAM_RESIDENT_NV            0x8647
+#define GL_TRACK_MATRIX_NV                0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
+typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
+typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, void **pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei n, const GLuint *programs, GLboolean *residences);
+GLAPI void APIENTRY glBindProgramNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glExecuteProgramNV (GLenum target, GLuint id, const GLfloat *params);
+GLAPI void APIENTRY glGenProgramsNV (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringNV (GLuint id, GLenum pname, GLubyte *program);
+GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum target, GLuint address, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivNV (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint index, GLenum pname, void **pointer);
+GLAPI GLboolean APIENTRY glIsProgramNV (GLuint id);
+GLAPI void APIENTRY glLoadProgramNV (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+GLAPI void APIENTRY glProgramParameter4dNV (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramParameter4dvNV (GLenum target, GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameter4fNV (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramParameter4fvNV (GLenum target, GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glProgramParameters4dvNV (GLenum target, GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameters4fvNV (GLenum target, GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glTrackMatrixNV (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+GLAPI void APIENTRY glVertexAttribPointerNV (GLuint index, GLint fsize, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glVertexAttrib1dNV (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fNV (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sNV (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dNV (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fNV (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sNV (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sNV (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4sNV (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs1svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs2svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs3svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs4svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GLubyte *v);
+#endif
+#endif /* GL_NV_vertex_program */
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+#endif /* GL_NV_vertex_program1_1 */
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+#endif /* GL_NV_vertex_program2 */
+
+#ifndef GL_NV_vertex_program2_option
+#define GL_NV_vertex_program2_option 1
+#endif /* GL_NV_vertex_program2_option */
+
+#ifndef GL_NV_vertex_program3
+#define GL_NV_vertex_program3 1
+#endif /* GL_NV_vertex_program3 */
+
+#ifndef GL_NV_vertex_program4
+#define GL_NV_vertex_program4 1
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_NV_vertex_program4 */
+
+#ifndef GL_NV_video_capture
+#define GL_NV_video_capture 1
+#define GL_VIDEO_BUFFER_NV                0x9020
+#define GL_VIDEO_BUFFER_BINDING_NV        0x9021
+#define GL_FIELD_UPPER_NV                 0x9022
+#define GL_FIELD_LOWER_NV                 0x9023
+#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV   0x9024
+#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025
+#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026
+#define GL_LAST_VIDEO_CAPTURE_STATUS_NV   0x9027
+#define GL_VIDEO_BUFFER_PITCH_NV          0x9028
+#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029
+#define GL_VIDEO_COLOR_CONVERSION_MAX_NV  0x902A
+#define GL_VIDEO_COLOR_CONVERSION_MIN_NV  0x902B
+#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C
+#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D
+#define GL_PARTIAL_SUCCESS_NV             0x902E
+#define GL_SUCCESS_NV                     0x902F
+#define GL_FAILURE_NV                     0x9030
+#define GL_YCBYCR8_422_NV                 0x9031
+#define GL_YCBAYCR8A_4224_NV              0x9032
+#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV  0x9033
+#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034
+#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV  0x9035
+#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036
+#define GL_Z4Y12Z4CB12Z4CR12_444_NV       0x9037
+#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV   0x9038
+#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV  0x9039
+#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A
+#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B
+#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C
+typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+GLAPI void APIENTRY glEndVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint video_capture_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#endif
+#endif /* GL_NV_video_capture */
+
+#ifndef GL_NV_viewport_array2
+#define GL_NV_viewport_array2 1
+#endif /* GL_NV_viewport_array2 */
+
+#ifndef GL_NV_viewport_swizzle
+#define GL_NV_viewport_swizzle 1
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV 0x9350
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV 0x9351
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV 0x9352
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV 0x9353
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV 0x9354
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV 0x9355
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV 0x9356
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV 0x9357
+#define GL_VIEWPORT_SWIZZLE_X_NV          0x9358
+#define GL_VIEWPORT_SWIZZLE_Y_NV          0x9359
+#define GL_VIEWPORT_SWIZZLE_Z_NV          0x935A
+#define GL_VIEWPORT_SWIZZLE_W_NV          0x935B
+typedef void (APIENTRYP PFNGLVIEWPORTSWIZZLENVPROC) (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew);
+#endif
+#endif /* GL_NV_viewport_swizzle */
+
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+#define GL_INTERLACE_OML                  0x8980
+#define GL_INTERLACE_READ_OML             0x8981
+#endif /* GL_OML_interlace */
+
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+#define GL_PACK_RESAMPLE_OML              0x8984
+#define GL_UNPACK_RESAMPLE_OML            0x8985
+#define GL_RESAMPLE_REPLICATE_OML         0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
+#define GL_RESAMPLE_AVERAGE_OML           0x8988
+#define GL_RESAMPLE_DECIMATE_OML          0x8989
+#endif /* GL_OML_resample */
+
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
+#endif /* GL_OML_subsample */
+
+#ifndef GL_OVR_multiview
+#define GL_OVR_multiview 1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR 0x9630
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR 0x9632
+#define GL_MAX_VIEWS_OVR                  0x9631
+#define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
+#endif
+#endif /* GL_OVR_multiview */
+
+#ifndef GL_OVR_multiview2
+#define GL_OVR_multiview2 1
+#endif /* GL_OVR_multiview2 */
+
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glHintPGI (GLenum target, GLint mode);
+#endif
+#endif /* GL_PGI_misc_hints */
+
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#endif /* GL_PGI_vertex_hints */
+
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#endif /* GL_REND_screen_coordinates */
+
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+#define GL_RGB_S3TC                       0x83A0
+#define GL_RGB4_S3TC                      0x83A1
+#define GL_RGBA_S3TC                      0x83A2
+#define GL_RGBA4_S3TC                     0x83A3
+#define GL_RGBA_DXT5_S3TC                 0x83A4
+#define GL_RGBA4_DXT5_S3TC                0x83A5
+#endif /* GL_S3_s3tc */
+
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum target, GLfloat *points);
+#endif
+#endif /* GL_SGIS_detail_texture */
+
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogFuncSGIS (GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *points);
+#endif
+#endif /* GL_SGIS_fog_function */
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#endif /* GL_SGIS_generate_mipmap */
+
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternSGIS (GLenum pattern);
+#endif
+#endif /* GL_SGIS_multisample */
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_SGIS_pixel_texture */
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+#endif /* GL_SGIS_point_line_texgen */
+
+#ifndef GL_SGIS_point_parameters
+#define GL_SGIS_point_parameters 1
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvSGIS (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_SGIS_point_parameters */
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum target, GLfloat *points);
+#endif
+#endif /* GL_SGIS_sharpen_texture */
+
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage4DSGIS (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_SGIS_texture4D */
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#endif /* GL_SGIS_texture_border_clamp */
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_SGIS_texture_color_mask 1
+#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
+typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif
+#endif /* GL_SGIS_texture_color_mask */
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#endif /* GL_SGIS_texture_edge_clamp */
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
+typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum target, GLenum filter, GLfloat *weights);
+GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif
+#endif /* GL_SGIS_texture_filter4 */
+
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#endif /* GL_SGIS_texture_lod */
+
+#ifndef GL_SGIS_texture_select
+#define GL_SGIS_texture_select 1
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#endif /* GL_SGIS_texture_select */
+
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+#define GL_ASYNC_MARKER_SGIX              0x8329
+typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
+typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
+typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint marker);
+GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *markerp);
+GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *markerp);
+GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei range);
+GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint marker, GLsizei range);
+GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint marker);
+#endif
+#endif /* GL_SGIX_async */
+
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
+#endif /* GL_SGIX_async_histogram */
+
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
+#endif /* GL_SGIX_async_pixel */
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#endif /* GL_SGIX_blend_alpha_minmax */
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#endif /* GL_SGIX_calligraphic_fragment */
+
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#endif /* GL_SGIX_clipmap */
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#endif /* GL_SGIX_convolution_accuracy */
+
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+#endif /* GL_SGIX_depth_pass_instrument */
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#endif /* GL_SGIX_depth_texture */
+
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushRasterSGIX (void);
+#endif
+#endif /* GL_SGIX_flush_raster */
+
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#endif /* GL_SGIX_fog_offset */
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_SGIX_fragment_lighting 1
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum face, GLenum mode);
+GLAPI void APIENTRY glFragmentLightfSGIX (GLenum light, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum light, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightiSGIX (GLenum light, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightivSGIX (GLenum light, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum face, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum face, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum face, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum face, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum light, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum light, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum face, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum face, GLenum pname, GLint *params);
+GLAPI void APIENTRY glLightEnviSGIX (GLenum pname, GLint param);
+#endif
+#endif /* GL_SGIX_fragment_lighting */
+
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameZoomSGIX (GLint factor);
+#endif
+#endif /* GL_SGIX_framezoom */
+
+#ifndef GL_SGIX_igloo_interface
+#define GL_SGIX_igloo_interface 1
+typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const void *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum pname, const void *params);
+#endif
+#endif /* GL_SGIX_igloo_interface */
+
+#ifndef GL_SGIX_instruments
+#define GL_SGIX_instruments 1
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
+typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
+typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
+GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei size, GLint *buffer);
+GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *marker_p);
+GLAPI void APIENTRY glReadInstrumentsSGIX (GLint marker);
+GLAPI void APIENTRY glStartInstrumentsSGIX (void);
+GLAPI void APIENTRY glStopInstrumentsSGIX (GLint marker);
+#endif
+#endif /* GL_SGIX_instruments */
+
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+#define GL_INTERLACE_SGIX                 0x8094
+#endif /* GL_SGIX_interlace */
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#endif /* GL_SGIX_ir_instrument1 */
+
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+#define GL_LIST_PRIORITY_SGIX             0x8182
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint list, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetListParameterivSGIX (GLuint list, GLenum pname, GLint *params);
+GLAPI void APIENTRY glListParameterfSGIX (GLuint list, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glListParameterfvSGIX (GLuint list, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glListParameteriSGIX (GLuint list, GLenum pname, GLint param);
+GLAPI void APIENTRY glListParameterivSGIX (GLuint list, GLenum pname, const GLint *params);
+#endif
+#endif /* GL_SGIX_list_priority */
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenSGIX (GLenum mode);
+#endif
+#endif /* GL_SGIX_pixel_texture */
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#endif /* GL_SGIX_pixel_tiles */
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_SGIX_polynomial_ffd 1
+#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
+#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
+#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
+#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
+#define GL_DEFORMATIONS_MASK_SGIX         0x8196
+#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+GLAPI void APIENTRY glDeformSGIX (GLbitfield mask);
+GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield mask);
+#endif
+#endif /* GL_SGIX_polynomial_ffd */
+
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation);
+#endif
+#endif /* GL_SGIX_reference_plane */
+
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+#define GL_PACK_RESAMPLE_SGIX             0x842E
+#define GL_UNPACK_RESAMPLE_SGIX           0x842F
+#define GL_RESAMPLE_REPLICATE_SGIX        0x8433
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x8434
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#endif /* GL_SGIX_resample */
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SGIX_scalebias_hint 1
+#define GL_SCALEBIAS_HINT_SGIX            0x8322
+#endif /* GL_SGIX_scalebias_hint */
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#endif /* GL_SGIX_shadow */
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#endif /* GL_SGIX_shadow_ambient */
+
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum pname, const GLint *params);
+#endif
+#endif /* GL_SGIX_sprite */
+
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#endif /* GL_SGIX_subsample */
+
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTagSampleBufferSGIX (void);
+#endif
+#endif /* GL_SGIX_tag_sample_buffer */
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#endif /* GL_SGIX_texture_add_env */
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
+#endif /* GL_SGIX_texture_coordinate_clamp */
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#endif /* GL_SGIX_texture_lod_bias */
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#endif /* GL_SGIX_texture_multi_buffer */
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#endif /* GL_SGIX_texture_scale_bias */
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#endif /* GL_SGIX_vertex_preclip */
+
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#endif /* GL_SGIX_ycrcb */
+
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+#endif /* GL_SGIX_ycrcb_subsample */
+
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#endif /* GL_SGIX_ycrcba */
+
+#ifndef GL_SGI_color_matrix
+#define GL_SGI_color_matrix 1
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#endif /* GL_SGI_color_matrix */
+
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableSGI (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameterivSGI (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTableSGI (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTableSGI (GLenum target, GLenum format, GLenum type, void *table);
+GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum target, GLenum pname, GLint *params);
+#endif
+#endif /* GL_SGI_color_table */
+
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#endif /* GL_SGI_texture_color_table */
+
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFinishTextureSUNX (void);
+#endif
+#endif /* GL_SUNX_constant_data */
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+#define GL_WRAP_BORDER_SUN                0x81D4
+#endif /* GL_SUN_convolution_border_modes */
+
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint factor);
+GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat factor);
+GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble factor);
+GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint factor);
+#endif
+#endif /* GL_SUN_global_alpha */
+
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+#define GL_QUAD_MESH_SUN                  0x8614
+#define GL_TRIANGLE_MESH_SUN              0x8615
+typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif
+#endif /* GL_SUN_mesh_array */
+
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+#define GL_SLICE_ACCUM_SUN                0x85CC
+#endif /* GL_SUN_slice_accum */
+
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+#define GL_RESTART_SUN                    0x0001
+#define GL_REPLACE_MIDDLE_SUN             0x0002
+#define GL_REPLACE_OLDEST_SUN             0x0003
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint code);
+GLAPI void APIENTRY glReplacementCodeusSUN (GLushort code);
+GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte code);
+GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *code);
+GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *code);
+GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *code);
+GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum type, GLsizei stride, const void **pointer);
+#endif
+#endif /* GL_SUN_triangle_list */
+
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *rc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif
+#endif /* GL_SUN_vertex */
+
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#endif /* GL_WIN_phong_shading */
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#endif /* GL_WIN_specular_fog */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

Build Results
RPM Lint

Refresh

Comments for request 3188 0

Request History

enzokiel created request almost 8 years ago

Update to version 2.6.16

enzokiel accepted request almost 8 years ago

Please add a comment