virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '99f40fd02f1870c2dee70977b672da9cb198f0be'

Browse Source 
* commit '99f40fd02f1870c2dee70977b672da9cb198f0be':
  sgienc: Do not end RLE lines with 0s

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-11-29 15:42:33 +01:00
commit ba32a22c86
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/sgienc.c
View File

@ -170,8 +170,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
} }
buf += length; buf += length;
bytestream_put_byte(&buf, 0); bytestream_put_be32(&lengthtab, length);
bytestream_put_be32(&lengthtab, length + 1);
in_buf -= p->linesize[0]; in_buf -= p->linesize[0];
} }
} }

4
tests/ref/lavf/sgi
View File

@ -1,3 +1,3 @@
7054acafd275e51cec28d4518e213081 *./tests/data/images/sgi/02.sgi d446e540a7c18da5fd3cc0e9942cd46f *./tests/data/images/sgi/02.sgi
./tests/data/images/sgi/%02d.sgi CRC=0x6da01946 ./tests/data/images/sgi/%02d.sgi CRC=0x6da01946
308151 ./tests/data/images/sgi/02.sgi 307287 ./tests/data/images/sgi/02.sgi

8
tests/ref/seek/lavf-sgi
View File

@ -1,4 +1,4 @@
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:308336 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:307472
ret:-EINVAL st:-1 flags:0 ts:-1.000000 ret:-EINVAL st:-1 flags:0 ts:-1.000000
ret:-EINVAL st:-1 flags:1 ts: 1.894167 ret:-EINVAL st:-1 flags:1 ts: 1.894167
ret:-EINVAL st: 0 flags:0 ts: 0.800000 ret:-EINVAL st: 0 flags:0 ts: 0.800000
@ -6,7 +6,7 @@ ret:-EINVAL st: 0 flags:1 ts:-0.320000
ret:-EINVAL st:-1 flags:0 ts: 2.576668 ret:-EINVAL st:-1 flags:0 ts: 2.576668
ret:-EINVAL st:-1 flags:1 ts: 1.470835 ret:-EINVAL st:-1 flags:1 ts: 1.470835
ret: 0 st: 0 flags:0 ts: 0.360000 ret: 0 st: 0 flags:0 ts: 0.360000
ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: -1 size:308572 ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: -1 size:307708
ret:-EINVAL st: 0 flags:1 ts:-0.760000 ret:-EINVAL st: 0 flags:1 ts:-0.760000
ret:-EINVAL st:-1 flags:0 ts: 2.153336 ret:-EINVAL st:-1 flags:0 ts: 2.153336
ret:-EINVAL st:-1 flags:1 ts: 1.047503 ret:-EINVAL st:-1 flags:1 ts: 1.047503
@ -18,7 +18,7 @@ ret:-EINVAL st: 0 flags:0 ts:-0.480000
ret:-EINVAL st: 0 flags:1 ts: 2.400000 ret:-EINVAL st: 0 flags:1 ts: 2.400000
ret:-EINVAL st:-1 flags:0 ts: 1.306672 ret:-EINVAL st:-1 flags:0 ts: 1.306672
ret: 0 st:-1 flags:1 ts: 0.200839 ret: 0 st:-1 flags:1 ts: 0.200839
ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: -1 size:308294 ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: -1 size:307430
ret:-EINVAL st: 0 flags:0 ts:-0.920000 ret:-EINVAL st: 0 flags:0 ts:-0.920000
ret:-EINVAL st: 0 flags:1 ts: 2.000000 ret:-EINVAL st: 0 flags:1 ts: 2.000000
ret:-EINVAL st:-1 flags:0 ts: 0.883340 ret:-EINVAL st:-1 flags:0 ts: 0.883340
@ -26,5 +26,5 @@ ret:-EINVAL st:-1 flags:1 ts:-0.222493
ret:-EINVAL st: 0 flags:0 ts: 2.680000 ret:-EINVAL st: 0 flags:0 ts: 2.680000
ret:-EINVAL st: 0 flags:1 ts: 1.560000 ret:-EINVAL st: 0 flags:1 ts: 1.560000
ret: 0 st:-1 flags:0 ts: 0.460008 ret: 0 st:-1 flags:0 ts: 0.460008
ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: -1 size:307773 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: -1 size:306909
ret:-EINVAL st:-1 flags:1 ts:-0.645825 ret:-EINVAL st:-1 flags:1 ts:-0.645825