Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 08:07:38 +0000 (10:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 08:10:14 +0000 (10:10 +0200)
commit7ec7d626a12164ef4195c57f5a016c9e0e26f2f5
tree052044ebf8d501e33a3591430aac8b96f77978f9
parent640a36a05c4d9d371086c22a158fb3d314a71538
parentaae159a7cc4df7d0521901022b778c9da251c24e
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@gmx.at>
libavcodec/nuv.c
tests/ref/fate/nuv-rtjpeg