Merge branch 'feature/refactor-openglrenderer'
# Conflicts: # .gitignore # .idea/.gitignore # AVQt/CMakeLists.txt # AVQt/decoder/DecoderD3D11VA.cpp # AVQt/decoder/DecoderD3D11VA.h # AVQt/decoder/private/DecoderD3D11VA_p.h # Player/main.cpp
No related branches found
No related tags found
Showing
- .gitignore 3 additions, 1 deletion.gitignore
- .idea/.gitignore 2 additions, 1 deletion.idea/.gitignore
- .idea/copyright/MIT.xml 6 additions, 0 deletions.idea/copyright/MIT.xml
- .idea/copyright/profiles_settings.xml 7 additions, 0 deletions.idea/copyright/profiles_settings.xml
- .idea/misc.xml 5 additions, 0 deletions.idea/misc.xml
- AVQt/AVQt 29 additions, 13 deletionsAVQt/AVQt
- AVQt/AVQtShader.qrc 0 additions, 0 deletionsAVQt/AVQtShader.qrc
- AVQt/CMakeLists.txt 53 additions, 40 deletionsAVQt/CMakeLists.txt
- AVQt/decoder/AudioDecoder.cpp 16 additions, 3 deletionsAVQt/decoder/AudioDecoder.cpp
- AVQt/decoder/AudioDecoder.h 1 addition, 5 deletionsAVQt/decoder/AudioDecoder.h
- AVQt/decoder/DecoderD3D11VA.cpp 17 additions, 4 deletionsAVQt/decoder/DecoderD3D11VA.cpp
- AVQt/decoder/DecoderD3D11VA.h 0 additions, 0 deletionsAVQt/decoder/DecoderD3D11VA.h
- AVQt/decoder/DecoderDXVA2.cpp 20 additions, 12 deletionsAVQt/decoder/DecoderDXVA2.cpp
- AVQt/decoder/DecoderDXVA2.h 23 additions, 39 deletionsAVQt/decoder/DecoderDXVA2.h
- AVQt/decoder/DecoderMMAL.cpp 18 additions, 5 deletionsAVQt/decoder/DecoderMMAL.cpp
- AVQt/decoder/DecoderMMAL.h 1 addition, 5 deletionsAVQt/decoder/DecoderMMAL.h
- AVQt/decoder/DecoderQSV.cpp 17 additions, 4 deletionsAVQt/decoder/DecoderQSV.cpp
- AVQt/decoder/DecoderQSV.h 1 addition, 5 deletionsAVQt/decoder/DecoderQSV.h
- AVQt/decoder/DecoderVAAPI.cpp 84 additions, 44 deletionsAVQt/decoder/DecoderVAAPI.cpp
- AVQt/decoder/DecoderVAAPI.h 1 addition, 5 deletionsAVQt/decoder/DecoderVAAPI.h
Loading
Please register or sign in to comment