* commit 'c6303f8d70':
yop: simplify/sanitize the decoding loop
c93: set palette_has_changed.
bmp: cosmetics, reformat
hlsenc: Don't duplicate a string constant
Conflicts:
libavcodec/bmp.c
tests/ref/fate/yop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 lines
360 B
Text
7 lines
360 B
Text
#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, 5, 5, 1, 302760, 0x26e93266
|