diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 16:36:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 16:40:59 +0100 |
| commit | 0b74fd11341230721ef188d520e166b105fb111c (patch) | |
| tree | 1a58104d6a3ed555757493112b677def569badc2 /tests/ref/fate/yop | |
| parent | 73562f1f834ef0ec8f5f881be73a135b9348c112 (diff) | |
| parent | dff6197dfb9b2d145729885c63f865c5fdd184aa (diff) | |
| download | ffmpeg-0b74fd11341230721ef188d520e166b105fb111c.tar.gz | |
Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa'
* commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa':
nuv: do not rely on get_buffer() initializing the frame.
yop: initialize palette to 0
Conflicts:
libavcodec/nuv.c
tests/ref/fate/nuv-rtjpeg-fh
tests/ref/fate/yop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/yop')
| -rw-r--r-- | tests/ref/fate/yop | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ref/fate/yop b/tests/ref/fate/yop index 758eacb864..1920281a40 100644 --- a/tests/ref/fate/yop +++ b/tests/ref/fate/yop @@ -1,7 +1,7 @@ #tb 0: 1/12 0, 0, 0, 1, 302760, 0xf24dfa37 0, 1, 1, 1, 302760, 0xcedcbb6c -0, 2, 2, 1, 302760, 0x8c2d19a2 -0, 3, 3, 1, 302760, 0xe0fc92da -0, 4, 4, 1, 302760, 0xd7699bb4 +0, 2, 2, 1, 302760, 0xc87716a2 +0, 3, 3, 1, 302760, 0x7e378e5a +0, 4, 4, 1, 302760, 0xd4a19734 0, 5, 5, 1, 302760, 0x26e93266 |