[FFmpeg-cvslog] Merge commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  5 02:46:45 2014 +0100| [6a4cc50980783013b19bfb2edaaca14cc38d5c92] | committer: Michael Niedermayer

Merge commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b'

* commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b':
  lagarith: reallocate rgb_planes when needed

Conflicts:
	libavcodec/lagarith.c

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

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