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/dfa3 | |
| 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/dfa3')
| -rw-r--r-- | tests/ref/fate/dfa3 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/ref/fate/dfa3 b/tests/ref/fate/dfa3 index f200ac5225..68ba09e4ee 100644 --- a/tests/ref/fate/dfa3 +++ b/tests/ref/fate/dfa3 @@ -1,10 +1,10 @@ -0, 0, 65024, 0xbf9d558b -0, 9000, 65024, 0x4c7ea2ac -0, 18000, 65024, 0x4931827c -0, 27000, 65024, 0x5a9e09a7 -0, 36000, 65024, 0x2b76eca9 -0, 45000, 65024, 0xd5400a96 -0, 54000, 65024, 0xcca17f23 -0, 63000, 65024, 0xebca0dec -0, 72000, 65024, 0x07a73cfc -0, 81000, 65024, 0xdd5e4620 +0, 0, 192000, 0x236a1b54 +0, 9000, 192000, 0xfb438b68 +0, 18000, 192000, 0xde504563 +0, 27000, 192000, 0xfaf88e05 +0, 36000, 192000, 0xe15de5af +0, 45000, 192000, 0x641fcca4 +0, 54000, 192000, 0x74899cb6 +0, 63000, 192000, 0x93fdb1b4 +0, 72000, 192000, 0x58d83456 +0, 81000, 192000, 0x7d3012ac |