-
Michael Niedermayer authored
* commit '1f3e56b6': gifdec: convert to bytestream2 Conflicts: libavcodec/gifdec.c libavcodec/lzw.c libavcodec/lzw.h See: 3fd60d80Merged-by: Michael Niedermayer <michaelni@gmx.at>
7a88b7a9
* commit '1f3e56b6': gifdec: convert to bytestream2 Conflicts: libavcodec/gifdec.c libavcodec/lzw.c libavcodec/lzw.h See: 3fd60d80Merged-by: Michael Niedermayer <michaelni@gmx.at>