diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-31 23:24:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-01 00:07:31 +0100 |
| commit | 4478e9d8db65ca827f2b3ef3ef6ee806bffdba45 (patch) | |
| tree | 795fe15fd00d5682450ca31aa25ecaf7fc0c3ee1 /tests/ref/fate/dfa2 | |
| parent | 2cba62bd84d15e84633b982f868fb1e50834c0d8 (diff) | |
| parent | febd022228660cb4b4d0e7b108bfec339b7dce92 (diff) | |
| download | ffmpeg-4478e9d8db65ca827f2b3ef3ef6ee806bffdba45.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add tests for dfa
mpegaudiodec: fix seeking.
mpegaudiodec: fix compilation when testing the unchecked bitstream reader
threads: add sysconf based number of CPUs detection
threads: always include necessary headers for number of CPUs detection
threads: default to automatic thread count detection
Changelog: restore version <next> header
cook: K&R formatting cosmetics
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/dfa2')
| -rw-r--r-- | tests/ref/fate/dfa2 | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/ref/fate/dfa2 b/tests/ref/fate/dfa2 new file mode 100644 index 0000000000..101fa2cc81 --- /dev/null +++ b/tests/ref/fate/dfa2 @@ -0,0 +1,17 @@ +0, 0, 308224, 0x8dc9803f +0, 6390, 308224, 0x06308b37 +0, 12780, 308224, 0xb8cb7be6 +0, 19170, 308224, 0xc538862b +0, 25560, 308224, 0x8d4b7702 +0, 31950, 308224, 0x97a479f0 +0, 38340, 308224, 0x63d08e67 +0, 44730, 308224, 0x470e8a18 +0, 51120, 308224, 0x08aa6be4 +0, 57510, 308224, 0x3b2f6f9a +0, 63900, 308224, 0xf0f1490c +0, 70290, 308224, 0xcb8b2ec5 +0, 76680, 308224, 0xab361e75 +0, 83070, 308224, 0x485aed6d +0, 89460, 308224, 0xd3e7ecb7 +0, 95850, 308224, 0xa2c0d561 +0, 102240, 308224, 0xd8f8ccd4 |