-
Michael Niedermayer authored
* commit '6c5eac9a': swscale: Remove unnecessary backslashes jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
050b48f3