diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-24 02:08:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-24 03:32:24 +0100 |
| commit | 8e576d58306df95d6373dd0ca2c1f21f1afaeca9 (patch) | |
| tree | 5f7b9c8783b342e80e32b58b94ded819eb414b3c /tests/ref/fate/nuv | |
| parent | 7ffa9ea05aa951b6b13e615f1bd3b8280f758561 (diff) | |
| parent | bbb46f3ec7128d8a624f2aa5b4f99ec44c0b9567 (diff) | |
| download | ffmpeg-8e576d58306df95d6373dd0ca2c1f21f1afaeca9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libavutil: add utility functions to simplify allocation of audio buffers.
libavutil: add planar sample formats and av_sample_fmt_is_planar()
avconv: fix segfault at EOF with delayed pictures
pcmdec: remove unneeded resetting of samples pointer
avconv: remove a now unused parameter from output_packet().
avconv: formatting fixes in output_packet()
avconv: declare some variables in blocks where they are used
avconv: use the same behavior when decoding audio/video/subs
bethsoftvideo: return proper consumed size for palette packets.
cdg: skip packets that don't contain a cdg command.
crcenc: add flags
avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
tiffenc: add a private option for selecting compression algorithm
md5enc: add flags
ARM: remove needless .text/.align directives
Conflicts:
doc/APIchanges
libavcodec/tiffenc.c
libavutil/avutil.h
libavutil/samplefmt.c
libavutil/samplefmt.h
tests/ref/fate/bethsoft-vid
tests/ref/fate/cdgraphics
tests/ref/fate/film-cvid-pcm-stereo-8bit
tests/ref/fate/mpeg2-field-enc
tests/ref/fate/nuv
tests/ref/fate/tiertex-seq
tests/ref/fate/tscc-32bit
tests/ref/fate/vmnc-32bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/nuv')
| -rw-r--r-- | tests/ref/fate/nuv | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tests/ref/fate/nuv b/tests/ref/fate/nuv index 69854f2b8f..46765f9086 100644 --- a/tests/ref/fate/nuv +++ b/tests/ref/fate/nuv @@ -1,30 +1,27 @@ 0, 0, 460800, 0x54aedafe 1, 0, 4096, 0x00000000 1, 2090, 4096, 0x4dfae7a6 -0, 3003, 460800, 0x54aedafe +0, 3003, 460800, 0xb7aa8b56 1, 4180, 4096, 0x3fd9f5c6 -0, 6006, 460800, 0x54aedafe +0, 6006, 460800, 0x283ea3b5 1, 6269, 4096, 0x7b86e310 1, 8359, 4096, 0x611cece5 -0, 9009, 460800, 0x54aedafe +0, 9009, 460800, 0x283ea3b5 1, 10449, 4096, 0xb7d8e872 -0, 12012, 460800, 0xb7aa8b56 +0, 12012, 460800, 0x10e577de 1, 12539, 4096, 0x072ef72b 1, 14629, 4096, 0xb3560144 -0, 15015, 460800, 0x283ea3b5 +0, 15015, 460800, 0x4e091ee2 1, 16718, 4096, 0x0a3d119e -0, 18018, 460800, 0x283ea3b5 +0, 18018, 460800, 0x2ea88828 1, 18808, 4096, 0xbe391aa4 1, 20898, 4096, 0x28f7c6e5 -0, 21021, 460800, 0x10e577de +0, 21021, 460800, 0x4b7f4df0 1, 22988, 4096, 0xca9d9df2 -0, 24024, 460800, 0x4e091ee2 +0, 24024, 460800, 0xa57f20d0 1, 25078, 4096, 0x5c6b95a9 -0, 27027, 460800, 0x2ea88828 1, 27167, 4096, 0x0bdfc0bf 1, 29257, 4096, 0xd95a9277 -0, 30030, 460800, 0x4b7f4df0 1, 31347, 4096, 0xae2bef2c -0, 33033, 460800, 0xa57f20d0 1, 33437, 4096, 0xbf031e83 1, 35527, 4096, 0x4c83e2d1 |