From b5322dea1ab770fbf463a6f8d242093a36189d93 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 14:49:55 -1000 Subject: [PATCH 01/38] #4: add .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f3e21a7 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,2 @@ +language: python +script: pytest From f49745144ac1b86d93f3e75fda8e56eb196745d8 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 14:51:16 -1000 Subject: [PATCH 02/38] #4: test CI --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dff103e..f5fd4a1 100644 --- a/README.md +++ b/README.md @@ -69,3 +69,4 @@ ffmpeg \ Screenshot Real-world signal graphs can get a heck of a lot more complex, but `ffmpeg-python` handles them with ease. + From 1e056940abc64d30bcfbebe587959d53930b80b6 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 14:52:39 -1000 Subject: [PATCH 03/38] #4: update travis config --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f3e21a7..8f42e99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,3 @@ language: python +install: pip install --user -r requirements.txt script: pytest From 816d50d577113730713a9713c0d227c8c19e0114 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 14:53:35 -1000 Subject: [PATCH 04/38] #4: update travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8f42e99..7c2e39d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: python -install: pip install --user -r requirements.txt +install: pip install -r requirements.txt script: pytest From 9bc13409c2d6216b51fcd4524d1eee8264f8c4ae Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 14:55:55 -1000 Subject: [PATCH 05/38] #4: update travis config --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c2e39d..7c882df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,2 @@ language: python -install: pip install -r requirements.txt -script: pytest +script: ${VIRTUAL_ENV}/pytest From 840f96b5478b096417989851c859d1755072e70b Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 14:59:11 -1000 Subject: [PATCH 06/38] #4: add build status indicator to readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index f5fd4a1..3e8f912 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # ffmpeg-python: Python bindings for FFmpeg +[![Build status](https://travis-ci.org/kkroening/ffmpeg-python.svg?branch=master)](https://travis-ci.org/kkroening/ffmpeg-python) + + ## Overview There are tons of Python FFmpeg wrappers out there but they seem to lack complex filter support. `ffmpeg-python` works well for simple as well as complex signal graphs. From 1542daeca131d9cca5996547d4170431c711fbb0 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:01:45 -1000 Subject: [PATCH 07/38] #4: update travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7c882df..b4795d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,2 @@ language: python -script: ${VIRTUAL_ENV}/pytest +script: ${VIRTUAL_ENV}/bin/pytest From e332857ab226e13c379392f42a62f8f0bb0dfe70 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:02:48 -1000 Subject: [PATCH 08/38] #4: update travis config --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b4795d1..72c686a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,3 @@ language: python -script: ${VIRTUAL_ENV}/bin/pytest +install: pip install pytest +script: pytest From 2e81b518a997a567b9507803065c794a9d62ea69 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:04:08 -1000 Subject: [PATCH 09/38] #4: update travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 72c686a..f204c30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: python -install: pip install pytest +install: pip install pytest && ~/virtualenv/python2.7/bin script: pytest From 391f6dea156cedc358ee8b8fc6fd4882dc928f0b Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:05:30 -1000 Subject: [PATCH 10/38] #4: update travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f204c30..76d8b5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: python -install: pip install pytest && ~/virtualenv/python2.7/bin +install: pip install pytest && ls ~/virtualenv/python2.7/bin script: pytest From 630b6e4f63abb3a48aa330075d5ccfd781d80e2c Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:06:51 -1000 Subject: [PATCH 11/38] #4: update travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 76d8b5e..b3ac24f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: python -install: pip install pytest && ls ~/virtualenv/python2.7/bin +install: pip install pytest && ls ~/virtualenv/python2.7/bin && false script: pytest From 93979232816143f038bc74b554bc08a4cddd026e Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:08:06 -1000 Subject: [PATCH 12/38] #4: update travis config --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3ac24f..42fb4c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,2 @@ language: python -install: pip install pytest && ls ~/virtualenv/python2.7/bin && false -script: pytest +script: py.test From 1d783fa73b902403543ef446e8de2a0aa0b06da7 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:10:10 -1000 Subject: [PATCH 13/38] #4: fix test directory assertion --- ffmpeg/tests/test_ffmpeg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 68b5b65..64bac21 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -104,7 +104,7 @@ def test_get_args_complex_filter(): '[1]hflip[v3];' \ '[v2][v3]overlay=eof_action=repeat[v4];' \ '[v4]drawbox=50:50:120:120:red:t=5[v5]', - '-map', '[v5]', '/Users/karlk/src/ffmpeg_wrapper/ffmpeg/tests/sample_data/dummy2.mp4', + '-map', '[v5]', os.path.join(SAMPLE_DATA_DIR, 'dummy2.mp4'), '-y' ] From 7db1c4fef12f7d5da028a14a35039bbd001fc674 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:11:14 -1000 Subject: [PATCH 14/38] #4: update travis config --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 42fb4c8..a948d93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,5 @@ language: python +install: + - sudo apt-get install ffmpeg + - pip install -r requirements.txt script: py.test From c36a69f0e8ce7246e919d9b51313b9de1698cef6 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:15:00 -1000 Subject: [PATCH 15/38] #4: update travis config --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a948d93..9f62a9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: python install: + - sudo add-apt-repository ppa:mc3man/trusty-media - sudo apt-get install ffmpeg - pip install -r requirements.txt script: py.test From 4fe531f4720cc700b47f982b317056bc22a850d4 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:19:47 -1000 Subject: [PATCH 16/38] #4: update travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9f62a9b..79f5a5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: python install: - - sudo add-apt-repository ppa:mc3man/trusty-media + - sudo add-apt-repository ppa:mc3man/trusty-media -y - sudo apt-get install ffmpeg - pip install -r requirements.txt script: py.test From a32ba188098c91f087c330809c63adc8a5b00d93 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:23:17 -1000 Subject: [PATCH 17/38] #4: print ffmpeg version --- ffmpeg/tests/test_ffmpeg.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 64bac21..1fed64f 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -1,5 +1,7 @@ + import ffmpeg import os +import subprocess TEST_DIR = os.path.dirname(__file__) @@ -9,6 +11,9 @@ TEST_OVERLAY_FILE = os.path.join(SAMPLE_DATA_DIR, 'overlay.png') TEST_OUTPUT_FILE = os.path.join(SAMPLE_DATA_DIR, 'dummy2.mp4') +print(subprocess.check_call(['-version'])) + + def test_fluent_equality(): base1 = ffmpeg.file_input('dummy1.mp4') base2 = ffmpeg.file_input('dummy1.mp4') From 0092e2a2dd2824ec39bd89eaba2ff4caa143ea9c Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:36:06 -1000 Subject: [PATCH 18/38] #4: update test --- ffmpeg/tests/test_ffmpeg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 1fed64f..eba4381 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -11,7 +11,7 @@ TEST_OVERLAY_FILE = os.path.join(SAMPLE_DATA_DIR, 'overlay.png') TEST_OUTPUT_FILE = os.path.join(SAMPLE_DATA_DIR, 'dummy2.mp4') -print(subprocess.check_call(['-version'])) +subprocess.check_call(['ffmpeg', '-version']) def test_fluent_equality(): From 3e03f5ef619dac2a95f1c05c8bc752fe1d4f00b7 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:38:36 -1000 Subject: [PATCH 19/38] #4: print ffmpeg version --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79f5a5c..bacc375 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: python +before_install: + - sudo apt-get -qq update + - sudo apt-get install -y ffmpeg install: - - sudo add-apt-repository ppa:mc3man/trusty-media -y - - sudo apt-get install ffmpeg - pip install -r requirements.txt script: py.test From f520618e14ec808f8e0dc507caf633c1663ffa38 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:41:42 -1000 Subject: [PATCH 20/38] #4: use -vf instead of -filter_complex --- ffmpeg/__init__.py | 2 +- ffmpeg/tests/test_ffmpeg.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ffmpeg/__init__.py b/ffmpeg/__init__.py index 9e8262f..5714a86 100755 --- a/ffmpeg/__init__.py +++ b/ffmpeg/__init__.py @@ -216,7 +216,7 @@ class _OutputNode(_Node): filter_arg = self._get_filter_arg(filter_nodes, stream_name_map) args += reduce(operator.add, [self._get_input_args(node) for node in input_nodes]) if filter_arg: - args += ['-filter_complex', filter_arg] + args += ['-vf', filter_arg] args += reduce(operator.add, [self._get_output_args(node, stream_name_map) for node in output_nodes]) args += reduce(operator.add, [self._get_global_args(node) for node in global_nodes], []) return args diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index eba4381..3e30213 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -102,7 +102,7 @@ def test_get_args_complex_filter(): assert args == [ '-i', TEST_INPUT_FILE, '-i', TEST_OVERLAY_FILE, - '-filter_complex', + '-vf', '[0]trim=start_frame=10:end_frame=20,setpts=PTS-STARTPTS[v0];' \ '[0]trim=start_frame=30:end_frame=40,setpts=PTS-STARTPTS[v1];' \ '[v0][v1]concat=n=2[v2];' \ From d7af3e9f5273012282e5e329d345a18d0e8ba8fe Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:42:06 -1000 Subject: [PATCH 21/38] #4: update readme to use -vf --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e8f912..d8d0398 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Take for example a signal graph that looks like this: The corresponding command-line arguments are pretty gnarly: ``` ffmpeg -i input.mp4 \ - -filter_complex "\ + -vf "\ [0]trim=start_frame=10:end_frame=20,setpts=PTS-STARTPTS[v0];\ [0]trim=start_frame=30:end_frame=40,setpts=PTS-STARTPTS[v1];\ [v0][v1]concat=n=2[v2];\ From 56102041aa403b46635bd6b1211e6d2d2af44560 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:45:13 -1000 Subject: [PATCH 22/38] Revert "#4: update readme to use -vf" This reverts commit d7af3e9f5273012282e5e329d345a18d0e8ba8fe. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d8d0398..3e8f912 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Take for example a signal graph that looks like this: The corresponding command-line arguments are pretty gnarly: ``` ffmpeg -i input.mp4 \ - -vf "\ + -filter_complex "\ [0]trim=start_frame=10:end_frame=20,setpts=PTS-STARTPTS[v0];\ [0]trim=start_frame=30:end_frame=40,setpts=PTS-STARTPTS[v1];\ [v0][v1]concat=n=2[v2];\ From 7adc3dff5b0544578f0abf02e7772f7fb19e1bf3 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:45:15 -1000 Subject: [PATCH 23/38] Revert "#4: use -vf instead of -filter_complex" This reverts commit f520618e14ec808f8e0dc507caf633c1663ffa38. --- ffmpeg/__init__.py | 2 +- ffmpeg/tests/test_ffmpeg.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ffmpeg/__init__.py b/ffmpeg/__init__.py index 5714a86..9e8262f 100755 --- a/ffmpeg/__init__.py +++ b/ffmpeg/__init__.py @@ -216,7 +216,7 @@ class _OutputNode(_Node): filter_arg = self._get_filter_arg(filter_nodes, stream_name_map) args += reduce(operator.add, [self._get_input_args(node) for node in input_nodes]) if filter_arg: - args += ['-vf', filter_arg] + args += ['-filter_complex', filter_arg] args += reduce(operator.add, [self._get_output_args(node, stream_name_map) for node in output_nodes]) args += reduce(operator.add, [self._get_global_args(node) for node in global_nodes], []) return args diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 3e30213..eba4381 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -102,7 +102,7 @@ def test_get_args_complex_filter(): assert args == [ '-i', TEST_INPUT_FILE, '-i', TEST_OVERLAY_FILE, - '-vf', + '-filter_complex', '[0]trim=start_frame=10:end_frame=20,setpts=PTS-STARTPTS[v0];' \ '[0]trim=start_frame=30:end_frame=40,setpts=PTS-STARTPTS[v1];' \ '[v0][v1]concat=n=2[v2];' \ From f05f2d9498396a1b6a1f513c40e40efb4cc9959a Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:46:26 -1000 Subject: [PATCH 24/38] #4: add failing test --- ffmpeg/tests/test_ffmpeg.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index eba4381..00f79e9 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -114,5 +114,9 @@ def test_get_args_complex_filter(): ] +def test_version(): + subprocess.check_call(['ffmpeg', '-version']) + assert 0 + def test_run(): ffmpeg.run(_get_complex_filter_example()) From 40517a3b395d32e963365a451c7b650e32d84e85 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:48:13 -1000 Subject: [PATCH 25/38] #4: update travis config --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bacc375..763500f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: python before_install: + - sudo add-apt-repository -y ppa:mc3man/trusty-media - sudo apt-get -qq update - sudo apt-get install -y ffmpeg install: From 6f20b23116b46f0ac5a22089c0564c0abfd6a6ca Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 15:55:20 -1000 Subject: [PATCH 26/38] #4: update travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 763500f..aa01e95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: python before_install: - - sudo add-apt-repository -y ppa:mc3man/trusty-media + - sudo add-apt-repository -y ppa:pavlyshko/precise - sudo apt-get -qq update - sudo apt-get install -y ffmpeg install: From d76a1a92d6ee50ba81a49be2807d67d87cbbbadc Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:20:39 -1000 Subject: [PATCH 27/38] #4: update travis config --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aa01e95..a2b3b6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: python before_install: - sudo add-apt-repository -y ppa:pavlyshko/precise - - sudo apt-get -qq update + - sudo apt-get update - sudo apt-get install -y ffmpeg + - echo butts >&2 install: - pip install -r requirements.txt script: py.test From c1cde420202145828d95e05fd3479865486fdd2f Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:24:15 -1000 Subject: [PATCH 28/38] #4: update travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a2b3b6e..01d2636 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: python before_install: - sudo add-apt-repository -y ppa:pavlyshko/precise - sudo apt-get update + - apt-cache madison ffmpeg - sudo apt-get install -y ffmpeg - - echo butts >&2 install: - pip install -r requirements.txt script: py.test From 50db3505187fcd5f7f90728df9f4a26920cdd3a3 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:28:28 -1000 Subject: [PATCH 29/38] #4: update travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 01d2636..cf3d0e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: python before_install: - sudo add-apt-repository -y ppa:pavlyshko/precise - sudo apt-get update - - apt-cache madison ffmpeg + - apt-cache madison pavlyshko/ffmpeg - sudo apt-get install -y ffmpeg install: - pip install -r requirements.txt From 97de7c43e72a9f28fb1d3b175ba44e6988f878ba Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:28:36 -1000 Subject: [PATCH 30/38] #4: update travis config --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf3d0e9..137e47b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: python before_install: - sudo add-apt-repository -y ppa:pavlyshko/precise - sudo apt-get update - - apt-cache madison pavlyshko/ffmpeg - - sudo apt-get install -y ffmpeg + - apt-cache madison ffmpeg + - sudo apt-get install -y pavlyshko/ffmpeg install: - pip install -r requirements.txt script: py.test From 2948d75ec8b9104cceecd4c61e7642e3ef441c04 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:30:01 -1000 Subject: [PATCH 31/38] #4: update travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 137e47b..0adcf99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ before_install: - sudo add-apt-repository -y ppa:pavlyshko/precise - sudo apt-get update - apt-cache madison ffmpeg - - sudo apt-get install -y pavlyshko/ffmpeg + - sudo apt-get install -y pavlyshko/precise/ffmpeg install: - pip install -r requirements.txt script: py.test From c50847aea94d981f0096f28eb4228ef90224cda0 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:31:23 -1000 Subject: [PATCH 32/38] #4: update travis config --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0adcf99..f17c99f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ before_install: - sudo add-apt-repository -y ppa:pavlyshko/precise - sudo apt-get update - apt-cache madison ffmpeg + - ls /etc/apt/preferences.d/ + - cat /etc/apt/preferences.d/priority-ubuntu - sudo apt-get install -y pavlyshko/precise/ffmpeg install: - pip install -r requirements.txt From 49005e7ed4354c5f4e733d7261c0d9b22f2020cd Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:31:53 -1000 Subject: [PATCH 33/38] #4: update travis config --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f17c99f..ba26537 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ before_install: - apt-cache madison ffmpeg - ls /etc/apt/preferences.d/ - cat /etc/apt/preferences.d/priority-ubuntu - - sudo apt-get install -y pavlyshko/precise/ffmpeg + - apt-cache policy + - sudo apt-get install -y ffmpeg install: - pip install -r requirements.txt script: py.test From 8bfcd903f490a9a758676627933481bb213a5365 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:32:46 -1000 Subject: [PATCH 34/38] #4: update travis config --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ba26537..7ef291a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ before_install: - apt-cache madison ffmpeg - ls /etc/apt/preferences.d/ - cat /etc/apt/preferences.d/priority-ubuntu + - apt-cache policy ffmpeg - apt-cache policy - sudo apt-get install -y ffmpeg install: From e635a8ddc34dfa3b22a7b4af8ee397720807939e Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:33:16 -1000 Subject: [PATCH 35/38] #4: update travis config --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ef291a..d4995f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,6 @@ before_install: - sudo add-apt-repository -y ppa:pavlyshko/precise - sudo apt-get update - apt-cache madison ffmpeg - - ls /etc/apt/preferences.d/ - - cat /etc/apt/preferences.d/priority-ubuntu - apt-cache policy ffmpeg - apt-cache policy - sudo apt-get install -y ffmpeg From 64661c694c6fea9d32412a9bb274af81b73ba771 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:44:42 -1000 Subject: [PATCH 36/38] #4: update travis config --- .travis.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index d4995f8..0bea499 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,7 @@ language: python before_install: - - sudo add-apt-repository -y ppa:pavlyshko/precise - - sudo apt-get update - - apt-cache madison ffmpeg - - apt-cache policy ffmpeg - - apt-cache policy - - sudo apt-get install -y ffmpeg + - curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-3.3.1-64bit-static.tar.xz + - tar Jxf ffmpeg-3.3.1-64bit-static.tar.xz install: - pip install -r requirements.txt -script: py.test +script: PATH=$(readlink -f ffmpeg-3.3.1-64bit-static):$PATH py.test From 9929c1618d30b86719a51fe59c844c51a4cb4753 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:53:50 -1000 Subject: [PATCH 37/38] #4: comment out `test_version` --- ffmpeg/tests/test_ffmpeg.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 00f79e9..825804d 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -114,9 +114,9 @@ def test_get_args_complex_filter(): ] -def test_version(): - subprocess.check_call(['ffmpeg', '-version']) - assert 0 +#def test_version(): +# subprocess.check_call(['ffmpeg', '-version']) + def test_run(): ffmpeg.run(_get_complex_filter_example()) From faf70b6295afc2891a43ab4269c779da66f686c5 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Thu, 25 May 2017 16:54:24 -1000 Subject: [PATCH 38/38] #4: clean up travis config --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0bea499..4442bf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,6 @@ before_install: - tar Jxf ffmpeg-3.3.1-64bit-static.tar.xz install: - pip install -r requirements.txt -script: PATH=$(readlink -f ffmpeg-3.3.1-64bit-static):$PATH py.test +script: + - export PATH=$(readlink -f ffmpeg-3.3.1-64bit-static):$PATH + - py.test