OSDN Git Service

Merge commit '1f3e56b6dcc163a705704e98569d4850a31d651c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 10:39:00 +0000 (11:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 10:46:08 +0000 (11:46 +0100)
commit7a88b7a9ad7ab5c9bd4b71db6790c59aa1155582
tree7b1af6617cd611919d387f58c0e44a4a7dd198ab
parent564ae836fb7bf73cddf39a0cc47108b5f067c126
parent1f3e56b6dcc163a705704e98569d4850a31d651c
Merge commit '1f3e56b6dcc163a705704e98569d4850a31d651c'

* commit '1f3e56b6dcc163a705704e98569d4850a31d651c':
  gifdec: convert to bytestream2

Conflicts:
libavcodec/gifdec.c
libavcodec/lzw.c
libavcodec/lzw.h

See: 3fd60d804996031ceaba9cad0b38652b92551eb0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/gifdec.c