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/dfa8 | |
| 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/dfa8')
| -rw-r--r-- | tests/ref/fate/dfa8 | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/tests/ref/fate/dfa8 b/tests/ref/fate/dfa8 index 0f695eec3d..c58a07633e 100644 --- a/tests/ref/fate/dfa8 +++ b/tests/ref/fate/dfa8 @@ -1,36 +1,36 @@ -0, 0, 45932, 0xf9bc2e69 -0, 6390, 45932, 0x5b8736ad -0, 12780, 45932, 0x4521ba17 -0, 19170, 45932, 0xf3a374a9 -0, 25560, 45932, 0x3fdfdc70 -0, 31950, 45932, 0x4eb18dbb -0, 38340, 45932, 0x633c6377 -0, 44730, 45932, 0x77dce8ba -0, 51120, 45932, 0x8246fecd -0, 57510, 45932, 0xe8864c0d -0, 63900, 45932, 0x995740d1 -0, 70290, 45932, 0xc8a298ee -0, 76680, 45932, 0xa3535672 -0, 83070, 45932, 0xb553f58b -0, 89460, 45932, 0x8a5b3b92 -0, 95850, 45932, 0x1bcd50b0 -0, 102240, 45932, 0xf22b0531 -0, 108630, 45932, 0x5f62bc78 -0, 115020, 45932, 0xc669075f -0, 121410, 45932, 0xae3b4e80 -0, 127800, 45932, 0x3f52062f -0, 134190, 45932, 0xde97a978 -0, 140580, 45932, 0x3ba7ca71 -0, 146970, 45932, 0xe418aba1 -0, 153360, 45932, 0xb8b3f24b -0, 159750, 45932, 0xd054791d -0, 166140, 45932, 0xddf121ce -0, 172530, 45932, 0xf0dcdd42 -0, 178920, 45932, 0xd5aa9281 -0, 185310, 45932, 0xffe8450b -0, 191700, 45932, 0x84f9424a -0, 198090, 45932, 0xe6c7592e -0, 204480, 45932, 0xc29c492d -0, 210870, 45932, 0x87186732 -0, 217260, 45932, 0x02c73e12 -0, 223650, 45932, 0x32eb90c8 +0, 0, 134724, 0x53784ca9 +0, 6390, 134724, 0x14c345b7 +0, 12780, 134724, 0xe0d0dd51 +0, 19170, 134724, 0xd53b5610 +0, 25560, 134724, 0x7cbb8d47 +0, 31950, 134724, 0x875d67c4 +0, 38340, 134724, 0x9811c085 +0, 44730, 134724, 0x25f6d228 +0, 51120, 134724, 0x349495a0 +0, 57510, 134724, 0xd0d75311 +0, 63900, 134724, 0xb49cdfbb +0, 70290, 134724, 0x9fa69518 +0, 76680, 134724, 0x28a1f58c +0, 83070, 134724, 0xb8dab657 +0, 89460, 134724, 0x8c7e3b3b +0, 95850, 134724, 0x37268acf +0, 102240, 134724, 0xcce8ca02 +0, 108630, 134724, 0xe0fd0c28 +0, 115020, 134724, 0x5bdac906 +0, 121410, 134724, 0xdd850bf0 +0, 127800, 134724, 0x2002a228 +0, 134190, 134724, 0x633617ea +0, 140580, 134724, 0x2a3ef337 +0, 146970, 134724, 0x507886c3 +0, 153360, 134724, 0x51c0f07b +0, 159750, 134724, 0x5e73dce1 +0, 166140, 134724, 0x26acc6f0 +0, 172530, 134724, 0x360c4349 +0, 178920, 134724, 0xc7dbabd4 +0, 185310, 134724, 0x671bbf66 +0, 191700, 134724, 0x4d44df79 +0, 198090, 134724, 0x69eade5b +0, 204480, 134724, 0x2b1bca82 +0, 210870, 134724, 0x8b16af47 +0, 217260, 134724, 0xb59fa1bd +0, 223650, 134724, 0x2ec17c24 |