[FFmpeg-cvslog] Merge commit '067432c1c95882c7221e694f33d9f3bdbe46de7f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 12:57:08 2013 +0100| [714ff44858a07578e592dfabd9e1f0a5edbf80bf] | committer: Michael Niedermayer

Merge commit '067432c1c95882c7221e694f33d9f3bdbe46de7f'

* commit '067432c1c95882c7221e694f33d9f3bdbe46de7f':
  loco: check that there is data left after decoding a plane.
  lagarith: avoid infinite loop in lag_rac_refill()

Conflicts:
	libavcodec/loco.c

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

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