Commit ec22d98a authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

temporary change to compile against ffmpeg 4

parent 54da7712
Pipeline #24452 failed with stage
in 5 minutes and 35 seconds
#ifndef BOB_IO_VIDEO_UTILS_H
#define BOB_IO_VIDEO_UTILS_H
#define AV_CODEC_FLAG_GLOBAL_HEADER (1 << 22)
#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
#define AVFMT_RAWPICTURE 0x0020
#include <map>
#include <vector>
#include <string>
......
......@@ -33,7 +33,7 @@ def test_codec_support():
# Assert we support, at least, some known codecs
for codec in ('ffv1', 'wmv2', 'mpeg4', 'mjpeg', 'h264'):
assert codec in supported
assert codec in supported, (codec, supported)
assert supported[codec]['encode']
assert supported[codec]['decode']
......
......@@ -32,7 +32,7 @@ requirements:
- bob.core
- bob.io.base
- libblitz {{ libblitz }}
- ffmpeg {{ ffmpeg }}
- ffmpeg 4.0
- boost {{ boost }}
- numpy {{ numpy }}
run:
......@@ -53,7 +53,6 @@ test:
- conda inspect linkages -p $PREFIX {{ name }} # [not win]
- conda inspect objects -p $PREFIX {{ name }} # [osx]
requires:
- bob-devel {{ bob_devel }}.*
- nose
- coverage
- sphinx
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment