Zebediah Figura : quartz: Merge the BaseControlVideo object into the video_window object.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 14b7035054a4d72e245824324f0e4db2ecc80e61
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=14b7035054a4d72e245824324f0e4db2ecc80e61

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Wed May  6 19:28:52 2020 -0500

quartz: Merge the BaseControlVideo object into the video_window object.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/quartz/Makefile.in      |   1 -
 dlls/quartz/quartz_private.h |  33 +--
 dlls/quartz/video.c          | 581 -------------------------------------------
 dlls/quartz/videorenderer.c  |  59 ++---
 dlls/quartz/vmr9.c           |  94 +++----
 dlls/quartz/window.c         | 545 ++++++++++++++++++++++++++++++++++++++++
 6 files changed, 615 insertions(+), 698 deletions(-)

Diff:   https://source.winehq.org/git/wine.git/?a=commitdiff;h=14b7035054a4d72e245824324f0e4db2ecc80e61