[FFmpeg-cvslog] Merge commit 'c697c590fbf296b1679b80c8f4071e4c8a6c884b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug  3 18:58:19 2014 +0200| [2212bff9a2761c7786b27a9b8e3b42659d7e346e] | committer: Michael Niedermayer

Merge commit 'c697c590fbf296b1679b80c8f4071e4c8a6c884b'

* commit 'c697c590fbf296b1679b80c8f4071e4c8a6c884b':
  lcl: Disentangle pointers to input data and decompression buffer

Conflicts:
	libavcodec/lcldec.c

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

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