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/dfa10 | |
| parent | ef611095f0d0c1256cbb6654f94cae61a60f2736 (diff) | |
| parent | f15f02c204e5fe355e084923c34dda1c6c3a66ec (diff) | |
| download | ffmpeg-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/dfa10')
| -rw-r--r-- | tests/ref/fate/dfa10 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/ref/fate/dfa10 b/tests/ref/fate/dfa10 index 72a32043b8..40da4e16b6 100644 --- a/tests/ref/fate/dfa10 +++ b/tests/ref/fate/dfa10 @@ -1,8 +1,8 @@ -0, 0, 65024, 0x8f31c3f0 -0, 6390, 65024, 0x164a2d82 -0, 12780, 65024, 0xbb72b738 -0, 19170, 65024, 0x45b93e3a -0, 25560, 65024, 0xcc4019df -0, 31950, 65024, 0x64644557 -0, 38340, 65024, 0xb4584b28 -0, 44730, 65024, 0x1d87966a +0, 0, 192000, 0x7384f9b2 +0, 6390, 192000, 0xd1f61c71 +0, 12780, 192000, 0x0c6937d1 +0, 19170, 192000, 0x56459a3a +0, 25560, 192000, 0x6d011790 +0, 31950, 192000, 0xb5347ce8 +0, 38340, 192000, 0xcd422568 +0, 44730, 192000, 0xde4fef2d |