diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-14 10:07:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-14 10:10:14 +0200 |
| commit | 7ec7d626a12164ef4195c57f5a016c9e0e26f2f5 (patch) | |
| tree | 052044ebf8d501e33a3591430aac8b96f77978f9 /libavcodec/ivi_dsp.c | |
| parent | 640a36a05c4d9d371086c22a158fb3d314a71538 (diff) | |
| parent | aae159a7cc4df7d0521901022b778c9da251c24e (diff) | |
| download | ffmpeg-7ec7d626a12164ef4195c57f5a016c9e0e26f2f5.tar.gz | |
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>
Diffstat (limited to 'libavcodec/ivi_dsp.c')
0 files changed, 0 insertions, 0 deletions