OpenSourceJoker/video2x
3
0
Fork 0
mirror of https://github.com/k4yt3x/video2x.git synced 2024-12-29 16:09:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #373 from donicrosby/master

Browse Source 
Fixed issue where if hwaccel value in config is overwritten with auto
This commit is contained in:
K4YT3X 2020-10-26 21:47:16 +00:00 committed by GitHub
commit 3f1821f1ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video2x_gui.py
View File

@ -684,9 +684,7 @@ class Video2XMainWindow(QMainWindow):
# extract frames # extract frames
self.config['ffmpeg']['extract_frames']['output_options']['-pix_fmt'] = self.ffmpeg_extract_frames_output_options_pixel_format_line_edit.text() self.config['ffmpeg']['extract_frames']['output_options']['-pix_fmt'] = self.ffmpeg_extract_frames_output_options_pixel_format_line_edit.text()
if self.ffmpeg_extract_frames_hardware_acceleration_check_box.isChecked(): if not self.ffmpeg_extract_frames_hardware_acceleration_check_box.isChecked():
self.config['ffmpeg']['extract_frames']['-hwaccel'] = 'auto'
else:
self.config['ffmpeg']['extract_frames'].pop('-hwaccel', None) self.config['ffmpeg']['extract_frames'].pop('-hwaccel', None)
# assemble video # assemble video
@ -712,9 +710,7 @@ class Video2XMainWindow(QMainWindow):
else: else:
self.config['ffmpeg']['assemble_video']['output_options'].pop('-vf', None) self.config['ffmpeg']['assemble_video']['output_options'].pop('-vf', None)
if self.ffmpeg_assemble_video_hardware_acceleration_check_box.isChecked(): if not self.ffmpeg_assemble_video_hardware_acceleration_check_box.isChecked():
self.config['ffmpeg']['assemble_video']['-hwaccel'] = 'auto'
else:
self.config['ffmpeg']['assemble_video'].pop('-hwaccel', None) self.config['ffmpeg']['assemble_video'].pop('-hwaccel', None)
# migrate streams # migrate streams
@ -768,9 +764,7 @@ class Video2XMainWindow(QMainWindow):
self.config['ffmpeg']['migrate_streams']['output_options'].pop('-movflags', None) self.config['ffmpeg']['migrate_streams']['output_options'].pop('-movflags', None)
# hardware acceleration # hardware acceleration
if self.ffmpeg_migrate_streams_hardware_acceleration_check_box.isChecked(): if not self.ffmpeg_migrate_streams_hardware_acceleration_check_box.isChecked():
self.config['ffmpeg']['migrate_streams']['-hwaccel'] = 'auto'
else:
self.config['ffmpeg']['migrate_streams'].pop('-hwaccel', None) self.config['ffmpeg']['migrate_streams'].pop('-hwaccel', None)
# Gifski # Gifski