From 42195f2c5d5b575f6b0a2324962c7788762c5f0f Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 21 Feb 2014 17:28:52 +0100
Subject: [PATCH] Shrink list of checked codecs to statisfy ffmpeg <= 0.5
(Ubuntu 10.04)
---
xbob/io/test_video.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/xbob/io/test_video.py b/xbob/io/test_video.py
index b1bdba6..a3fae02 100644
--- a/xbob/io/test_video.py
+++ b/xbob/io/test_video.py
@@ -16,7 +16,6 @@ from . import test_utils
# These are some global parameters for the test.
INPUT_VIDEO = test_utils.datafile('test.mov', __name__)
-@test_utils.ffmpeg_found()
def test_codec_support():
# Describes all encoders
@@ -30,7 +29,7 @@ def test_codec_support():
if v['encode']: assert describe_encoder(v['id'])
# Assert we support, at least, some known codecs
- for codec in ('ffv1', 'zlib', 'wmv2', 'mpeg4', 'mjpeg'):
+ for codec in ('ffv1', 'wmv2', 'mpeg4', 'mjpeg'):
assert codec in supported
assert supported[codec]['encode']
assert supported[codec]['decode']
--
GitLab