diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-02 05:48:34 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-02 06:10:30 +0400 |
| commit | 4121148388f4fd02ace89eca364904d3ea8bcfe7 (patch) | |
| tree | c346f6906942b7a12c5c1f06e9d11205ea5660ab /tests/ref/fate/dfa11 | |
| 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/dfa11')
| -rw-r--r-- | tests/ref/fate/dfa11 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/ref/fate/dfa11 b/tests/ref/fate/dfa11 index cda4cbc502..53a3bed8df 100644 --- a/tests/ref/fate/dfa11 +++ b/tests/ref/fate/dfa11 @@ -1,9 +1,9 @@ -0, 0, 65024, 0x10db5645 -0, 6390, 65024, 0xb5d8a5bd -0, 12780, 65024, 0xc9555f27 -0, 19170, 65024, 0x74c43f84 -0, 25560, 65024, 0x5b2445b0 -0, 31950, 65024, 0x8bd5be38 -0, 38340, 65024, 0x75ec97da -0, 44730, 65024, 0x34416636 -0, 51120, 65024, 0x9cc2abcf +0, 0, 192000, 0x4269d703 +0, 6390, 192000, 0xdf8667e7 +0, 12780, 192000, 0x450026ad +0, 19170, 192000, 0x2528ea52 +0, 25560, 192000, 0x83bcd1ec +0, 31950, 192000, 0x88d5ba27 +0, 38340, 192000, 0x44424577 +0, 44730, 192000, 0xd93f12a3 +0, 51120, 192000, 0xcd625f3e |