Merge remote-tracking branch 'upstream/master' into master-build
* upstream/master: WinGui: Language consistency tweak in queue. WinGui: Re-implement queue import/export functionality for the GUI. Note, this is incompatible with the CLI Queue parser. There is an existing separate option for exporting into a CLI friendly JSON format. Format subject to change in the future. For now, this is a quick way of getting this functionality back. #898 MacGui: use HB_VCODEC_X264_MASK to check whether x264 is selected or not. MacGui: don't show fast decode checkbox when the encoder is not x264, fixes #2083. MacGui: localize the 'None' item in the fallback encoders popup. MacGui: disable auto passthru fallback encoder options when fallback is set to none. MacGui: fix warnings.
Showing with 220 additions and 272 deletions
This diff is collapsed.