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/dfa7 | |
| parent | ef611095f0d0c1256cbb6654f94cae61a60f2736 (diff) | |
| parent | f15f02c204e5fe355e084923c34dda1c6c3a66ec (diff) | |
| download | ffmpeg-streaming-4121148388f4fd02ace89eca364904d3ea8bcfe7.zip ffmpeg-streaming-4121148388f4fd02ace89eca364904d3ea8bcfe7.tar.gz | |
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/dfa7')
| -rw-r--r-- | tests/ref/fate/dfa7 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/ref/fate/dfa7 b/tests/ref/fate/dfa7 index 33cc0fb..dce4264 100644 --- a/tests/ref/fate/dfa7 +++ b/tests/ref/fate/dfa7 @@ -1,12 +1,12 @@ -0, 0, 3648, 0xb6174031 -0, 6390, 3648, 0x2e4649b0 -0, 12780, 3648, 0xe05247cb -0, 19170, 3648, 0x003941f0 -0, 25560, 3648, 0xa2563fed -0, 31950, 3648, 0x23d34cf1 -0, 38340, 3648, 0x624f5173 -0, 44730, 3648, 0xc07a491e -0, 51120, 3648, 0x74214090 -0, 57510, 3648, 0xebfd469c -0, 63900, 3648, 0x60083f49 -0, 70290, 3648, 0x6096486f +0, 0, 7866, 0xab73dae7 +0, 6390, 7866, 0x100adec8 +0, 12780, 7866, 0x1a20ddfa +0, 19170, 7866, 0xc358cd16 +0, 25560, 7866, 0xee0bd20e +0, 31950, 7866, 0xef26bef9 +0, 38340, 7866, 0xa9d0c755 +0, 44730, 7866, 0x6c11cc7c +0, 51120, 7866, 0x4d6ed988 +0, 57510, 7866, 0x9965cf24 +0, 63900, 7866, 0x9a12db24 +0, 70290, 7866, 0x2e85cfeb |
