Skip to content

Commit c05a3c9

Browse files
jonoomphjonoomph
authored
Merge pull request #5200 from OpenShot/fix-duplicate-profile-names
Duplicate Profile Names can not be selected
2 parents ebe2ad3 + eed7a2c commit c05a3c9

File tree

156 files changed

+237
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+237
-164
lines changed

‎.github/workflows/ci.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
runs-on: ${{ matrix.os }}
66
strategy:
77
matrix:
8-
os: [ubuntu-18.04, ubuntu-20.04]
8+
os: [ubuntu-20.04, ubuntu-22.04]
99
defaults:
1010
run:
1111
shell: bash
@@ -23,8 +23,5 @@ jobs:
2323
pip3 install setuptools wheel sentry-sdk
2424
pip3 install cx_Freeze==6.1 distro defusedxml requests certifi chardet urllib3
2525
26-
- name: Build Python package
27-
run: python3 freeze.py build
28-
2926
- name: Test
3027
run: python3 ./src/tests/query_tests.py -platform minimal

‎src/profiles/00240x0160p0015_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 15 fps
1+
description=HQVGA 160p 15 fps - 240x160 | 3:2
22
frame_rate_num=15
33
frame_rate_den=1
44
width=240

‎src/profiles/00240x0160p0024_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 24 fps
1+
description=HQVGA 160p 24 fps - 240x160 | 3:2
22
frame_rate_num=24
33
frame_rate_den=1
44
width=240

‎src/profiles/00240x0160p0025_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 25 fps
1+
description=HQVGA 160p 25 fps - 240x160 | 3:2
22
frame_rate_num=25
33
frame_rate_den=1
44
width=240

‎src/profiles/00240x0160p0030_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 30 fps
1+
description=HQVGA 160p 30 fps - 240x160 | 3:2
22
frame_rate_num=30
33
frame_rate_den=1
44
width=240

‎src/profiles/00240x0160p0050_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 50 fps
1+
description=HQVGA 160p 50 fps - 240x160 | 3:2
22
frame_rate_num=50
33
frame_rate_den=1
44
width=240

‎src/profiles/00240x0160p0060_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 60 fps
1+
description=HQVGA 160p 60 fps - 240x160 | 3:2
22
frame_rate_num=60
33
frame_rate_den=1
44
width=240

‎src/profiles/00240x0160p2398_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 23.98 fps
1+
description=HQVGA 160p 23.98 fps - 240x160 | 3:2
22
frame_rate_num=24000
33
frame_rate_den=1001
44
width=240

‎src/profiles/00240x0160p2997_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 29.97 fps
1+
description=HQVGA 160p 29.97 fps - 240x160 | 3:2
22
frame_rate_num=30000
33
frame_rate_den=1001
44
width=240

‎src/profiles/00240x0160p5994_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 59.94 fps
1+
description=HQVGA 160p 59.94 fps - 240x160 | 3:2
22
frame_rate_num=60000
33
frame_rate_den=1001
44
width=240

‎src/profiles/00256x0160p0015_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 15 fps
1+
description=HQVGA 160p 15 fps - 256x160 | 16:10
22
frame_rate_num=15
33
frame_rate_den=1
44
width=256

‎src/profiles/00256x0160p0024_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 24 fps
1+
description=HQVGA 160p 24 fps - 256x160 | 16:10
22
frame_rate_num=24
33
frame_rate_den=1
44
width=256

‎src/profiles/00256x0160p0025_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 25 fps
1+
description=HQVGA 160p 25 fps - 256x160 | 16:10
22
frame_rate_num=25
33
frame_rate_den=1
44
width=256

‎src/profiles/00256x0160p0030_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 30 fps
1+
description=HQVGA 160p 30 fps - 256x160 | 16:10
22
frame_rate_num=30
33
frame_rate_den=1
44
width=256

‎src/profiles/00256x0160p0050_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 50 fps
1+
description=HQVGA 160p 50 fps - 256x160 | 16:10
22
frame_rate_num=50
33
frame_rate_den=1
44
width=256

‎src/profiles/00256x0160p0060_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 60 fps
1+
description=HQVGA 160p 60 fps - 256x160 | 16:10
22
frame_rate_num=60
33
frame_rate_den=1
44
width=256

‎src/profiles/00256x0160p2398_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 23.98 fps
1+
description=HQVGA 160p 23.98 fps - 256x160 | 16:10
22
frame_rate_num=24000
33
frame_rate_den=1001
44
width=256

‎src/profiles/00256x0160p2997_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 29.97 fps
1+
description=HQVGA 160p 29.97 fps - 256x160 | 16:10
22
frame_rate_num=30000
33
frame_rate_den=1001
44
width=256

‎src/profiles/00256x0160p5994_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=HQVGA 160p 59.94 fps
1+
description=HQVGA 160p 59.94 fps - 256x160 | 16:10
22
frame_rate_num=60000
33
frame_rate_den=1001
44
width=256

‎src/profiles/00352x0576i0025_16-09

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=PAL SD Anamorphic 576i 25 fps
1+
description=PAL SD Anamorphic 576i 25 fps - 352x576 | 16:9
22
frame_rate_num=25
33
frame_rate_den=1
44
width=352

‎src/profiles/00352x0576p0025_16-09

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=PAL SD Anamorphic 576p 25 fps
1+
description=PAL SD Anamorphic 576p 25 fps - 352x576 | 16:9
22
frame_rate_num=25
33
frame_rate_den=1
44
width=352

‎src/profiles/00360x0240p0015_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 15 fps
1+
description=WQVGA 240p 15 fps - 360x240 | 3:2
22
frame_rate_num=15
33
frame_rate_den=1
44
width=360

‎src/profiles/00360x0240p0024_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 24 fps
1+
description=WQVGA 240p 24 fps - 360x240 | 3:2
22
frame_rate_num=24
33
frame_rate_den=1
44
width=360

‎src/profiles/00360x0240p0025_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 25 fps
1+
description=WQVGA 240p 25 fps - 360x240 | 3:2
22
frame_rate_num=25
33
frame_rate_den=1
44
width=360

‎src/profiles/00360x0240p0030_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 30 fps
1+
description=WQVGA 240p 30 fps - 360x240 | 3:2
22
frame_rate_num=30
33
frame_rate_den=1
44
width=360

‎src/profiles/00360x0240p0050_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 50 fps
1+
description=WQVGA 240p 50 fps - 360x240 | 3:2
22
frame_rate_num=50
33
frame_rate_den=1
44
width=360

‎src/profiles/00360x0240p0060_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 60 fps
1+
description=WQVGA 240p 60 fps - 360x240 | 3:2
22
frame_rate_num=60
33
frame_rate_den=1
44
width=360

‎src/profiles/00360x0240p2398_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 23.98 fps
1+
description=WQVGA 240p 23.98 fps - 360x240 | 3:2
22
frame_rate_num=24000
33
frame_rate_den=1001
44
width=360

‎src/profiles/00360x0240p2997_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 29.97 fps
1+
description=WQVGA 240p 29.97 fps - 360x240 | 3:2
22
frame_rate_num=30000
33
frame_rate_den=1001
44
width=360

‎src/profiles/00360x0240p5994_03-02

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 59.94 fps
1+
description=WQVGA 240p 59.94 fps - 360x240 | 3:2
22
frame_rate_num=60000
33
frame_rate_den=1001
44
width=360

‎src/profiles/00384x0240p0015_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 15 fps
1+
description=WQVGA 240p 15 fps - 384x240 | 16:10
22
frame_rate_num=15
33
frame_rate_den=1
44
width=384

‎src/profiles/00384x0240p0024_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 24 fps
1+
description=WQVGA 240p 24 fps - 384x240 | 16:10
22
frame_rate_num=24
33
frame_rate_den=1
44
width=384

‎src/profiles/00384x0240p0025_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 25 fps
1+
description=WQVGA 240p 25 fps - 384x240 | 16:10
22
frame_rate_num=25
33
frame_rate_den=1
44
width=384

‎src/profiles/00384x0240p0030_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 30 fps
1+
description=WQVGA 240p 30 fps - 384x240 | 16:10
22
frame_rate_num=30
33
frame_rate_den=1
44
width=384

‎src/profiles/00384x0240p0050_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 50 fps
1+
description=WQVGA 240p 50 fps - 384x240 | 16:10
22
frame_rate_num=50
33
frame_rate_den=1
44
width=384

‎src/profiles/00384x0240p0060_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 60 fps
1+
description=WQVGA 240p 60 fps - 384x240 | 16:10
22
frame_rate_num=60
33
frame_rate_den=1
44
width=384

‎src/profiles/00384x0240p2398_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 23.98 fps
1+
description=WQVGA 240p 23.98 fps - 384x240 | 16:10
22
frame_rate_num=24000
33
frame_rate_den=1001
44
width=384

‎src/profiles/00384x0240p2997_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 29.97 fps
1+
description=WQVGA 240p 29.97 fps - 384x240 | 16:10
22
frame_rate_num=30000
33
frame_rate_den=1001
44
width=384

‎src/profiles/00384x0240p5994_16-10

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 59.94 fps
1+
description=WQVGA 240p 59.94 fps - 384x240 | 16:10
22
frame_rate_num=60000
33
frame_rate_den=1001
44
width=384

‎src/profiles/00400x0240p0015_05-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 15 fps
1+
description=WQVGA 240p 15 fps - 400x240 | 5:3
22
frame_rate_num=15
33
frame_rate_den=1
44
width=400

‎src/profiles/00400x0240p0024_05-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 24 fps
1+
description=WQVGA 240p 24 fps - 400x240 | 5:3
22
frame_rate_num=24
33
frame_rate_den=1
44
width=400

‎src/profiles/00400x0240p0025_05-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 25 fps
1+
description=WQVGA 240p 25 fps - 400x240 | 5:3
22
frame_rate_num=25
33
frame_rate_den=1
44
width=400

‎src/profiles/00400x0240p0030_05-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 30 fps
1+
description=WQVGA 240p 30 fps - 400x240 | 5:3
22
frame_rate_num=30
33
frame_rate_den=1
44
width=400

‎src/profiles/00400x0240p0050_05-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 50 fps
1+
description=WQVGA 240p 50 fps - 400x240 | 5:3
22
frame_rate_num=50
33
frame_rate_den=1
44
width=400

‎src/profiles/00400x0240p0060_05-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 60 fps
1+
description=WQVGA 240p 60 fps - 400x240 | 5:3
22
frame_rate_num=60
33
frame_rate_den=1
44
width=400

‎src/profiles/00400x0240p2398_05-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 23.98 fps
1+
description=WQVGA 240p 23.98 fps - 400x240 | 5:3
22
frame_rate_num=24000
33
frame_rate_den=1001
44
width=400

‎src/profiles/00400x0240p2997_05-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 29.97 fps
1+
description=WQVGA 240p 29.97 fps - 400x240 | 5:3
22
frame_rate_num=30000
33
frame_rate_den=1001
44
width=400

‎src/profiles/00400x0240p5994_05-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=WQVGA 240p 59.94 fps
1+
description=WQVGA 240p 59.94 fps - 400x240 | 5:3
22
frame_rate_num=60000
33
frame_rate_den=1001
44
width=400

‎src/profiles/00480x0480i0030_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD Anamorphic 480i 30 fps
1+
description=NTSC SD Anamorphic 480i 30 fps - 480x480 | 4:3
22
frame_rate_num=30
33
frame_rate_den=1
44
width=480

‎src/profiles/00480x0480i2398_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD Anamorphic 480i 23.98 fps
1+
description=NTSC SD Anamorphic 480i 23.98 fps - 480x480 | 4:3
22
frame_rate_num=24000
33
frame_rate_den=1001
44
width=480

‎src/profiles/00480x0480i2398_16-09

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD Anamorphic 480i 23.98 fps
1+
description=NTSC SD Anamorphic 480i 23.98 fps - 480x480 | 16:9
22
frame_rate_num=24000
33
frame_rate_den=1001
44
width=480

‎src/profiles/00480x0480i2997_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD Anamorphic 480i 29.97 fps
1+
description=NTSC SD Anamorphic 480i 29.97 fps - 480x480 | 4:3
22
frame_rate_num=30000
33
frame_rate_den=1001
44
width=480

‎src/profiles/00480x0480i2997_16-09

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD Anamorphic 480i 29.97 fps
1+
description=NTSC SD Anamorphic 480i 29.97 fps - 480x480 | 16:9
22
frame_rate_num=30000
33
frame_rate_den=1001
44
width=480

‎src/profiles/00480x0576i0025_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=PAL SD Anamorphic 576i 25 fps
1+
description=PAL SD Anamorphic 576i 25 fps - 480x576 | 4:3
22
frame_rate_num=25
33
frame_rate_den=1
44
width=480

‎src/profiles/00480x0576i0025_16-09

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=PAL SD Anamorphic 576i 25 fps
1+
description=PAL SD Anamorphic 576i 25 fps - 480x576 | 16:9
22
frame_rate_num=25
33
frame_rate_den=1
44
width=480

‎src/profiles/00480x0576p0025_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=PAL SD Anamorphic 576p 25 fps
1+
description=PAL SD Anamorphic 576p 25 fps - 480x576 | 4:3
22
frame_rate_num=25
33
frame_rate_den=1
44
width=480

‎src/profiles/00480x0576p0025_16-09

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=PAL SD Anamorphic 576p 25 fps
1+
description=PAL SD Anamorphic 576p 25 fps - 480x576 | 16:9
22
frame_rate_num=25
33
frame_rate_den=1
44
width=480

‎src/profiles/00528x0480i0025_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD 3/4 Anamorphic 480i 25 fps
1+
description=NTSC SD 3/4 Anamorphic 480i 25 fps - 528x480 | 4:3
22
frame_rate_num=25
33
frame_rate_den=1
44
width=528

‎src/profiles/00528x0480i2997_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD 3/4 Anamorphic 480i 29.97 fps
1+
description=NTSC SD 3/4 Anamorphic 480i 29.97 fps - 528x480 | 4:3
22
frame_rate_num=30000
33
frame_rate_den=1001
44
width=528

‎src/profiles/00528x0480p0025_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD 3/4 Anamorphic 480p 25 fps
1+
description=NTSC SD 3/4 Anamorphic 480p 25 fps - 528x480 | 4:3
22
frame_rate_num=25
33
frame_rate_den=1
44
width=528

‎src/profiles/00528x0480p2398_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD 3/4 Anamorphic 480p 23.98 fps
1+
description=NTSC SD 3/4 Anamorphic 480p 23.98 fps - 528x480 | 4:3
22
frame_rate_num=24000
33
frame_rate_den=1001
44
width=528

‎src/profiles/00544x0480i0025_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD 3/4 Anamorphic 480i 25 fps
1+
description=NTSC SD 3/4 Anamorphic 480i 25 fps - 544x480 | 4:3
22
frame_rate_num=25
33
frame_rate_den=1
44
width=544

‎src/profiles/00544x0480i2997_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD 3/4 Anamorphic 480i 29.97 fps
1+
description=NTSC SD 3/4 Anamorphic 480i 29.97 fps - 544x480 | 4:3
22
frame_rate_num=30000
33
frame_rate_den=1001
44
width=544

‎src/profiles/00544x0480p0025_04-03

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description=NTSC SD 3/4 Anamorphic 480p 25 fps
1+
description=NTSC SD 3/4 Anamorphic 480p 25 fps - 544x480 | 4:3
22
frame_rate_num=25
33
frame_rate_den=1
44
width=544

0 commit comments

Comments
 (0)