[FFmpeg-cvslog] Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 14 10:07:38 2013 +0200| [7ec7d626a12164ef4195c57f5a016c9e0e26f2f5] | committer: Michael Niedermayer

Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'

* commit 'aae159a7cc4df7d0521901022b778c9da251c24e':
  nuv: Do not ignore lzo decompression failures

Conflicts:
	libavcodec/nuv.c
	tests/ref/fate/nuv-rtjpeg

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

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