# Conflicts:
#	AVQt/CMakeLists.txt
#	AVQt/encoder/EncoderQSV.cpp
#	AVQt/encoder/private/EncoderQSV_p.h
#	AVQt/output/OpenGLRenderer.cpp
#	Player/CMakeLists.txt
#	Player/main.cpp

# Conflicts:
#	.gitignore
#	.idea/.gitignore
#	AVQt/CMakeLists.txt
#	AVQt/decoder/DecoderD3D11VA.cpp
#	AVQt/decoder/DecoderD3D11VA.h
#	AVQt/decoder/private/DecoderD3D11VA_p.h
#	Player/main.cpp

- Increased decoder gpu frame pool size to 64 frames to support
filter graphs (would else result in out of memory errors)

 - Added (untested) support for RGB0 VASurface
 - Done some work on OpenGLWidgetRenderer (not finished, huge rewrite
   scheduled to next commit)

Merge remote-tracking branch 'origin/feature/refactor-openglrenderer' into feature/refactor-openglrenderer

# Conflicts:
#	AVQt/renderers/private/unix/OpenGLRenderer_p.cpp

 - DXVA2 decoder is marked deprecated, as it should not be used,
  because D3D11 is much more recent and efficient,
  and works better with OpenGL, as it has no byte alignment for textures
 - made some preparations for a consistent copyright notice

 - HAS BUGS!!! NOT WORKING!!!

# Conflicts:
#	.gitignore
#	AVQt/CMakeLists.txt

# Conflicts:
#	.idea/.gitignore
#	.idea/deployment.xml

 - a lot of bugs with correct destruction of resources in OpenGLRenderer
 - a bug in the state control chain, that could cause a segfault

 - Rendering coded stayed in OpenGLRenderer
 - "New" OpenGLWidgetRenderer, which contains the widget
     functionality of the old OpenGLRenderer
 - OpenGLRenderer can be reused for whatever surface you'd like to,
     as long as it supports OpenGL

Resolve "Rewrite Audio output"

Closes #1

See merge request !12

Audio output works perfectly after first tests, even after fast repeatedly pausing and resuming, the audio stays synchronized to the video

Revert "Merge branch 'nik/LibAVQt-cmake-fixes'"

See merge request !13

This reverts merge request !11