Skip to content

Commit ba07a3f

Browse files
bug fixes
1 parent 1c4c717 commit ba07a3f

13 files changed

Lines changed: 29 additions & 58 deletions

File tree

.appveyor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ install:
3636
- python -m easy_install -U setuptools
3737
# - pip install -e .[test]
3838
# - pip install --upgrade virtualenv
39-
# - pip install -r requirements.txt
40-
- pip install requests
41-
- pip install boto3
42-
- pip install azure-storage-blob
43-
- pip install google-cloud-storage
39+
- pip install -r requirements.txt
40+
# - pip install requests
41+
# - pip install boto3
42+
# - pip install azure-storage-blob
43+
# - pip install google-cloud-storage
4444
- ps: Start-FileDownload $env:ffmpeg_download
4545

4646
- 7z x ffmpeg-20190225-f948082-win64-static.zip

.github/workflows/pythonpackage.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ jobs:
2020
- name: Install dependencies
2121
run: |
2222
python -m pip install --upgrade pip
23-
pip install requests
24-
pip install boto3
25-
pip install google-cloud-storage
26-
pip install azure-storage-blob
23+
pip install -r requirements.txt
24+
# pip install requests
25+
# pip install boto3
26+
# pip install google-cloud-storage
27+
# pip install azure-storage-blob
2728
- name: Install ffmpeg
2829
run: |
2930
sudo apt-get update

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ language: python
22

33
before_install:
44
- python -m pip install --upgrade pip
5-
- pip install requests
6-
- pip install boto3
7-
- pip install google-cloud-storage
8-
- pip install azure-storage-blob
5+
- pip install -r requirements.txt
6+
# - pip install requests
7+
# - pip install boto3
8+
# - pip install google-cloud-storage
9+
# - pip install azure-storage-blob
910
- >
1011
[ -f ffmpeg-release/ffmpeg ] || (
1112
curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz &&

examples/clouds/aws_cloud.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def main():
5656
.dash(from_aws_cloud, adaption='"id=0,streams=v id=1,streams=a"')
5757
.format('libx265')
5858
.auto_rep()
59-
.package('/var/www/media/stream.mpd', to_aws_cloud, transcode_progress)
59+
.package('/var/www/media/stream.mpd', to_aws_cloud, progress=transcode_progress)
6060
)
6161

6262

examples/clouds/cloud.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def main():
5757
.dash(from_cloud, adaption='"id=0,streams=v id=1,streams=a"')
5858
.format('libx265')
5959
.auto_rep()
60-
.package('/var/www/media/stream.mpd', to_cloud, transcode_progress)
60+
.package('/var/www/media/stream.mpd', to_cloud, progress=transcode_progress)
6161
)
6262

6363

examples/clouds/google_cloud.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def main():
5555
.hls(from_google_cloud)
5656
.format('libx264')
5757
.auto_rep()
58-
.package('/var/www/media/stream.mpd', to_google_cloud, transcode_progress)
58+
.package('/var/www/media/stream.mpd', to_google_cloud, progress=transcode_progress)
5959
)
6060

6161

examples/dash/dash.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def main():
3636
.dash(args.input, adaption='"id=0,streams=v id=1,streams=a"')
3737
.format('libx265')
3838
.auto_rep()
39-
.package(args.output, transcode_progress)
39+
.package(args.output, progress=transcode_progress)
4040
)
4141

4242

examples/dash/dash_manual.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def main():
4242
.dash(args.input, adaption='"id=0,streams=v id=1,streams=a"')
4343
.format('libx265')
4444
.add_rep(rep1, rep2, rep3)
45-
.package(args.output, transcode_progress)
45+
.package(args.output, progress=transcode_progress)
4646
)
4747

4848

examples/hls/hls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def main():
3636
.hls(args.input, hls_time=20)
3737
.format('libx264')
3838
.auto_rep()
39-
.package(args.output, transcode_progress)
39+
.package(args.output, progress=transcode_progress)
4040
)
4141

4242

examples/hls/hls_encryption.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def main():
4545
.encryption(args.key, args.url)
4646
.format('libx264')
4747
.auto_rep()
48-
.package(args.output, transcode_progress)
48+
.package(args.output, progress=transcode_progress)
4949
)
5050

5151

0 commit comments

Comments
 (0)