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/dfa6 | |
| 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/dfa6')
| -rw-r--r-- | tests/ref/fate/dfa6 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/ref/fate/dfa6 b/tests/ref/fate/dfa6 new file mode 100644 index 0000000000..9adb612775 --- /dev/null +++ b/tests/ref/fate/dfa6 @@ -0,0 +1,12 @@ +0, 0, 65024, 0x190f2398 +0, 6390, 65024, 0x19d8c3e0 +0, 12780, 65024, 0x848020a2 +0, 19170, 65024, 0xbb64696f +0, 25560, 65024, 0x85886472 +0, 31950, 65024, 0xc9c26668 +0, 38340, 65024, 0xf24d1524 +0, 44730, 65024, 0x64d98cd0 +0, 51120, 65024, 0xa1323b5e +0, 57510, 65024, 0x9f48dcf9 +0, 63900, 65024, 0x1a0591da +0, 70290, 65024, 0x8eabf12e |