Skip to content

Commit 4da3e8e

Browse files
committed
Get format information from PyAV
1 parent 5513b71 commit 4da3e8e

File tree

2 files changed

+90
-326
lines changed

2 files changed

+90
-326
lines changed

auto_editor/edit.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,8 @@ def set_video_codec(
6868
) -> str:
6969
if codec == "auto":
7070
codec = "h264" if (src is None or not src.videos) else src.videos[0].codec
71-
if ctr.vcodecs is not None:
72-
if ctr.vstrict and codec not in ctr.vcodecs:
73-
return ctr.vcodecs[0]
74-
75-
if codec in ctr.disallow_v:
76-
return ctr.vcodecs[0]
71+
if ctr.vcodecs and codec not in ctr.vcodecs:
72+
return ctr.vcodecs[0]
7773
return codec
7874

7975
if codec == "copy":
@@ -83,12 +79,7 @@ def set_video_codec(
8379
log.error("Input file does not have a video stream to copy codec from.")
8480
codec = src.videos[0].codec
8581

86-
if ctr.vstrict:
87-
assert ctr.vcodecs is not None
88-
if codec not in ctr.vcodecs:
89-
log.error(codec_error.format(codec, out_ext))
90-
91-
if codec in ctr.disallow_v:
82+
if ctr.vcodecs is not None and codec not in ctr.vcodecs:
9283
log.error(codec_error.format(codec, out_ext))
9384

9485
return codec
@@ -99,7 +90,7 @@ def set_audio_codec(
9990
) -> str:
10091
if codec == "auto":
10192
codec = "aac" if (src is None or not src.audios) else src.audios[0].codec
102-
if ctr.acodecs is not None and codec not in ctr.acodecs:
93+
if ctr.acodecs and codec not in ctr.acodecs:
10394
return ctr.acodecs[0]
10495
return codec
10596

0 commit comments

Comments
 (0)