Merge branch 'bugfix/T29552-VideoRecorder' into develop
9decc31da4a5
Actions

Description

Merge branch 'bugfix/T29552-VideoRecorder' into develop

Details

Provenance

kislinsk	Authored on May 2 2023, 2:13 PM
kislinsk	Pushed on May 2 2023, 2:13 PM

Parents

rMITK5d178bd7c3dd: Add class documentation
rMITK744abe4bcdc9: Fix crash on group removal

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK9decc31da4a5: Merge branch 'bugfix/T29552-VideoRecorder' into develop (authored by kislinsk).May 2 2023, 2:13 PM

kislinsk mentioned this in T29565: 2023 Week 18 (Very Early May).May 4 2023, 3:02 PM

Merged Changes

5d178bd7c3dd Add class documentation
Author
kislinsk
Browse Repository
No Builds
No Audits
d5f451418e1e Run encoding in a separate thread
Author
kislinsk
Browse Repository
No Builds
No Audits
3323512f47b5 Return FFmpeg exit code
Author
kislinsk
Browse Repository
No Builds
No Audits
21eae9f7bf2e Update documentation
Author
kislinsk
Browse Repository
No Builds
No Audits
63e78ed669ed Use VideoRecorder in Movie Maker
Author
kislinsk
Browse Repository
No Builds
No Audits
b3264f4c59d5 Add preference page for Movie Maker
Author
kislinsk
Browse Repository
No Builds
No Audits
23dccd1bc6ef Add VideoRecorder class
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

Packages

Modules/

Core/

CMakeLists.txt

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

include/

mitkVideoRecorder.h

O1: MITK Reviewer Group I

src/

Rendering/

mitkVideoRecorder.cpp

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.ext/

src/

internal/

QmitkExternalProgramsPreferencePage.cpp

O1: MITK Reviewer Group I

QmitkExternalProgramsPreferencePage.h

O1: MITK Reviewer Group I

QmitkExternalProgramsPreferencePage.ui

O1: MITK Reviewer Group I

org.mitk.gui.qt.moviemaker/

documentation/

UserManual/

QmitkMovieMaker.dox

O3: MITK Reviewer Group II

QmitkMovieMaker_Preferences.png

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

plugin.xml

O3: MITK Reviewer Group II

src/

internal/

QmitkMovieMakerPreferencePage.cpp

O3: MITK Reviewer Group II

QmitkMovieMakerPreferencePage.ui

O3: MITK Reviewer Group II

QmitkMovieMakerView.cpp

O3: MITK Reviewer Group II

QmitkMovieMakerView.h

O3: MITK Reviewer Group II

QmitkMovieMakerView.ui

O3: MITK Reviewer Group II

mitkMovieMakerPluginActivator.cpp

O3: MITK Reviewer Group II

	org.mitk.gui.qt.moviemaker/	src/	internal/
	org.mitk.gui.qt.ext/	src/	internal/

	QmitkMovieMakerPreferencePage.h
	QmitkExternalProgramsPreferencePage.h

O3: MITK Reviewer Group II

rMITK9decc31da4a5

View Options

Modules/Core/CMakeLists.txt

View Options

Modules/Core/files.cmake

View Options

Modules/Core/include/mitkVideoRecorder.h

View Options

Modules/Core/src/Rendering/mitkVideoRecorder.cpp

View Options

Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.h

View Options

Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.ui

View Options

Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker.dox

View Options

Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker_Preferences.png

View Options

Plugins/org.mitk.gui.qt.moviemaker/files.cmake

View Options

Plugins/org.mitk.gui.qt.moviemaker/plugin.xml

View Options

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerPreferencePage.h

View Options

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerPreferencePage.ui

View Options

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerView.cpp

View Options

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerView.h

View Options

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerView.ui

View Options

Plugins/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.cpp

Merge branch 'bugfix/T29552-VideoRecorder' into develop9decc31da4a5Actions

Description

Details

Event Timeline

Merged Changes

Changes (18)

rMITK9decc31da4a5

Modules/Core/CMakeLists.txt

Modules/Core/files.cmake

Modules/Core/include/mitkVideoRecorder.h

Modules/Core/src/Rendering/mitkVideoRecorder.cpp

Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.cpp

Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.h

Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.ui

Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker.dox

Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker_Preferences.png

Plugins/org.mitk.gui.qt.moviemaker/files.cmake

Plugins/org.mitk.gui.qt.moviemaker/plugin.xml

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerPreferencePage.cpp

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerPreferencePage.h

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerPreferencePage.ui

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerView.cpp

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerView.h

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerView.ui

Plugins/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.cpp

Merge branch 'bugfix/T29552-VideoRecorder' into develop
9decc31da4a5
Actions