Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
bbb999 committed Feb 10, 2022
2 parents 10f1f7b + 937398a commit 6f08b73
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: 2
build:
os: ubuntu-20.04
tools:
python: "2.7"
python: "3.10"
# You can also specify other tool versions:
# nodejs: "16"
# rust: "1.55"
Expand Down
3 changes: 3 additions & 0 deletions docs/application/application.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ app.encoder

Provides access to Adobe Media Encoder (on the same system).

Warning: app.encoder is broken on Premiere Pro 14.3.1 - 15 on Mac only. Fixed in 22 and up.
https://community.adobe.com/t5/premiere-pro-discussions/missing-the-object-app-encoder-14-3-1-15-0-15-1-15-2/m-p/12544488

**Type**

:ref:`encoder`.
Expand Down
3 changes: 3 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@
# ones.
extensions = [
'sphinx.ext.todo',
'sphinx_rtd_dark_mode'
]

default_dark_mode = False

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

Expand Down
3 changes: 3 additions & 0 deletions docs/general/encoder.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ Encoder object

The **encoder** object represents Adobe Media Encoder, and is used for local rendering, outside of Premiere Pro.

Warning: app.encoder is broken on Premiere Pro 14.3.1 - 15 on Mac only. Fixed in 22 and up.
https://community.adobe.com/t5/premiere-pro-discussions/missing-the-object-app-encoder-14-3-1-15-0-15-1-15-2/m-p/12544488

----

==========
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
sphinx
sphinx==4.4
sphinx_rtd_theme
sphinx_rtd_dark_mode
docutils<0.18

0 comments on commit 6f08b73

Please sign in to comment.