9dbedf331e
* commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b': 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>