[FFmpeg-cvslog] Merge commit '1f3e56b6dcc163a705704e98569d4850a31d651c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 11:39:00 2013 +0100| [7a88b7a9ad7ab5c9bd4b71db6790c59aa1155582] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a88b7a9ad7ab5c9bd4b71db6790c59aa1155582
---