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 /tests/ref/fate/nuv-rtjpeg | |
| parent | 640a36a05c4d9d371086c22a158fb3d314a71538 (diff) | |
| parent | aae159a7cc4df7d0521901022b778c9da251c24e (diff) | |
| download | ffmpeg-streaming-7ec7d626a12164ef4195c57f5a016c9e0e26f2f5.zip ffmpeg-streaming-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 'tests/ref/fate/nuv-rtjpeg')
| -rw-r--r-- | tests/ref/fate/nuv-rtjpeg | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/ref/fate/nuv-rtjpeg b/tests/ref/fate/nuv-rtjpeg index 8838fbb..96ead33 100644 --- a/tests/ref/fate/nuv-rtjpeg +++ b/tests/ref/fate/nuv-rtjpeg @@ -7,4 +7,3 @@ 0, 9, 9, 1, 460800, 0x4e091ee2 0, 10, 10, 1, 460800, 0x2ea88828 0, 11, 11, 1, 460800, 0x4b7f4df0 -0, 12, 12, 1, 460800, 0xa57f20d0 |
