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/dfa6 | |
| 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/dfa6')
| -rw-r--r-- | tests/ref/fate/dfa6 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/ref/fate/dfa6 b/tests/ref/fate/dfa6 index 9adb612775..a59c7ff498 100644 --- a/tests/ref/fate/dfa6 +++ b/tests/ref/fate/dfa6 @@ -1,12 +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 +0, 0, 192000, 0xb718dc63 +0, 6390, 192000, 0x2efb7b89 +0, 12780, 192000, 0x70827047 +0, 19170, 192000, 0x61e1fd2f +0, 25560, 192000, 0x06f8bccd +0, 31950, 192000, 0xf0362404 +0, 38340, 192000, 0xc00fc1b8 +0, 44730, 192000, 0x94265476 +0, 51120, 192000, 0x4b50ad23 +0, 57510, 192000, 0x4d578b60 +0, 63900, 192000, 0xfb14b875 +0, 70290, 192000, 0x81682338 |