diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-02 02:48:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-02 03:10:30 +0100 |
| commit | 4121148388f4fd02ace89eca364904d3ea8bcfe7 (patch) | |
| tree | c346f6906942b7a12c5c1f06e9d11205ea5660ab /tests/ref/fate/dfa5 | |
| parent | ef611095f0d0c1256cbb6654f94cae61a60f2736 (diff) | |
| parent | f15f02c204e5fe355e084923c34dda1c6c3a66ec (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: make -frames work for all types of streams, not just video.
bfi: K&R cosmetics
bgmc: K&R cleanup
rawdec: Set start_time to 0 for raw audio files.
Detect 'yuv2' as rawvideo also in avi.
rawdec: propagate pict_type information to the output frame
rawdec: Support more QT 1bpp rawvideo files.
avconv: free bitstream filters
threads: limit the number of automatic threads to MAX_AUTO_THREADS
avplay: K&R cleanup
fate: use rgb24 as output format for dfa tests
threads: set thread_count to 1 when thread support is disabled
threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264
Conflicts:
ffplay.c
libavcodec/avcodec.h
libavcodec/pthread.c
libavcodec/version.h
tests/ref/fate/dfa1
tests/ref/fate/dfa10
tests/ref/fate/dfa11
tests/ref/fate/dfa2
tests/ref/fate/dfa3
tests/ref/fate/dfa4
tests/ref/fate/dfa5
tests/ref/fate/dfa6
tests/ref/fate/dfa7
tests/ref/fate/dfa8
tests/ref/fate/dfa9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/dfa5')
| -rw-r--r-- | tests/ref/fate/dfa5 | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/ref/fate/dfa5 b/tests/ref/fate/dfa5 index 4aaacde6db..4b9a9926ee 100644 --- a/tests/ref/fate/dfa5 +++ b/tests/ref/fate/dfa5 @@ -1,15 +1,15 @@ -0, 0, 65024, 0x54831a1a -0, 9000, 65024, 0x110f5bad -0, 18000, 65024, 0xdd4f97fa -0, 27000, 65024, 0x1ab375b2 -0, 36000, 65024, 0x311b51d3 -0, 45000, 65024, 0xb0614f71 -0, 54000, 65024, 0x6d968927 -0, 63000, 65024, 0x28d85028 -0, 72000, 65024, 0x74ea41f5 -0, 81000, 65024, 0x3480b067 -0, 90000, 65024, 0x3e1115d4 -0, 99000, 65024, 0x0c715b57 -0, 108000, 65024, 0x3acaaea3 -0, 117000, 65024, 0x1b60f1e8 -0, 126000, 65024, 0xcee14632 +0, 0, 192000, 0x9754890f +0, 9000, 192000, 0x01668965 +0, 18000, 192000, 0xbd1b5e12 +0, 27000, 192000, 0x2e97fb9f +0, 36000, 192000, 0xf8b452e2 +0, 45000, 192000, 0xc6859449 +0, 54000, 192000, 0x910844f7 +0, 63000, 192000, 0x99443581 +0, 72000, 192000, 0xec52d1e5 +0, 81000, 192000, 0x2fc66c35 +0, 90000, 192000, 0xd9af7379 +0, 99000, 192000, 0x947a26ef +0, 108000, 192000, 0x7b77ab28 +0, 117000, 192000, 0x2507637e +0, 126000, 192000, 0x6ce8c0ea |