Merge commit '99f40fd02f1870c2dee70977b672da9cb198f0be'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/sgienc.c
Simple merge

diff --cc tests/ref/lavf/sgi
index a43c1f42871dda0f30dca5c8130d618ac3dbdbde,703b83cf66f0759df9bdcac30ca2b8b38a3440ec..6f45802d866f61ecf2bf472d62dd034988ba2d7d
--- 1/tests/ref/lavf/sgi
--- 2/tests/ref/lavf/sgi
+++ b/tests/ref/lavf/sgi
@@@ -1,3 -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=0x28c7369b
 +./tests/data/images/sgi/%02d.sgi CRC=0x6da01946
- 308151 ./tests/data/images/sgi/02.sgi
+ 307287 ./tests/data/images/sgi/02.sgi

diff --cc tests/ref/seek/lavf-sgi
index b07132a66955452562c8c16f44500cf48f096391,04c7b2b1a4f266a871943d5f059fb8bcbd6b9f9c..fac6ad9769397e8e843ef30b3c76667237b32a55
--- 1/tests/ref/seek/lavf-sgi
--- 2/tests/ref/seek/lavf-sgi
+++ b/tests/ref/seek/lavf-sgi
@@@ -5,8 -5,7 +5,8 @@@ ret:-EINVAL    st: 0 flags:0  ts: 0.800
  ret:-EINVAL    st: 0 flags:1  ts:-0.320000
  ret:-EINVAL    st:-1 flags:0  ts: 2.576668
  ret:-EINVAL    st:-1 flags:1  ts: 1.470835
 -ret:-EINVAL    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:-1 flags:0  ts: 2.153336
  ret:-EINVAL    st:-1 flags:1  ts: 1.047503
@@@ -17,14 -16,12 +17,14 @@@ ret:-EINVAL    st:-1 flags:1  ts: 0.624
  ret:-EINVAL    st: 0 flags:0  ts:-0.480000
  ret:-EINVAL    st: 0 flags:1  ts: 2.400000
  ret:-EINVAL    st:-1 flags:0  ts: 1.306672
 -ret:-EINVAL    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:1  ts: 2.000000
  ret:-EINVAL    st:-1 flags:0  ts: 0.883340
  ret:-EINVAL    st:-1 flags:1  ts:-0.222493
  ret:-EINVAL    st: 0 flags:0  ts: 2.680000
  ret:-EINVAL    st: 0 flags:1  ts: 1.560000
 -ret:-EINVAL    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