[FFmpeg-cvslog] Merge commit 'e89aa4bf56e5b5c45f569eb12733519789e057da'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 01:43:01 2014 +0100| [508229adb930c03ee0539faada5ff0b14fb570d6] | committer: Michael Niedermayer

Merge commit 'e89aa4bf56e5b5c45f569eb12733519789e057da'

* commit 'e89aa4bf56e5b5c45f569eb12733519789e057da':
  lzw: switch to bytestream2

Conflicts:
	libavcodec/lzw.c

See: 44c4170c52c10e3da3a7ea8e3435ef37c4edc2cc
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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