mirror of https://github.com/FFmpeg/FFmpeg.git
This commit removes the badly duplicated code between the encoder and the muxer. That may sound surprising, but the encoder is now responsible from the encoding of the picture when muxing to a .gif file. It also does not require anymore a manual user intervention such as a -pix_fmt rgb24 to work properly. To summarize, output gif are now easier to generate, code is saner and simpler, and files are smaller (thanks to the lzw encoding which was unused so far with the default .gif output). We can certainly make things even better, but this is the first step. FATE is updated because of the output being produced by the encoder and not the muxer (no lzw in the muxer), and in the seek test only the size mismatches. Fixes Ticket #2262pull/15/head
parent
1efcab02b6
commit
635389ccfa
5 changed files with 87 additions and 231 deletions
@ -1,24 +1,24 @@ |
||||
e6089fd4ef3b9df44090ab3650bdd810 *./tests/data/lavf/lavf.gif |
||||
2906401 ./tests/data/lavf/lavf.gif |
||||
./tests/data/lavf/lavf.gif CRC=0x9825d7c0 |
||||
66398be6fafa026fb0fa5f2978fa3446 *./tests/data/lavf/lavf.gif |
||||
2011766 ./tests/data/lavf/lavf.gif |
||||
./tests/data/lavf/lavf.gif CRC=0x0d96deb8 |
||||
022dc66b5068404e88c618ce79d9eb5f *./tests/data/images/gif/02.gif |
||||
./tests/data/images/gif/%02d.gif CRC=0x032e0034 |
||||
./tests/data/images/gif/%02d.gif CRC=0x51811243 |
||||
81538 ./tests/data/images/gif/02.gif |
||||
759522b3025fcf8ed6aae582a18c5a14 *./tests/data/images/gif/02.gif |
||||
./tests/data/images/gif/%02d.gif CRC=0x4c8f8a89 |
||||
38715 ./tests/data/images/gif/02.gif |
||||
21e802ae7a2239bdbea6f915da1134b9 *./tests/data/images/gif/02.gif |
||||
./tests/data/images/gif/%02d.gif CRC=0x4c8f8a89 |
||||
38715 ./tests/data/images/gif/02.gif |
||||
fc4792ac40319344dc7027668a403fc3 *./tests/data/images/gif/02.gif |
||||
./tests/data/images/gif/%02d.gif CRC=0x032e0034 |
||||
022dc66b5068404e88c618ce79d9eb5f *./tests/data/images/gif/02.gif |
||||
./tests/data/images/gif/%02d.gif CRC=0x006183fd |
||||
81538 ./tests/data/images/gif/02.gif |
||||
022dc66b5068404e88c618ce79d9eb5f *./tests/data/images/gif/02.gif |
||||
./tests/data/images/gif/%02d.gif CRC=0x006183fd |
||||
81538 ./tests/data/images/gif/02.gif |
||||
022dc66b5068404e88c618ce79d9eb5f *./tests/data/images/gif/02.gif |
||||
./tests/data/images/gif/%02d.gif CRC=0x51811243 |
||||
81538 ./tests/data/images/gif/02.gif |
||||
022dc66b5068404e88c618ce79d9eb5f *./tests/data/images/gif/02.gif |
||||
./tests/data/images/gif/%02d.gif CRC=0x51811243 |
||||
81538 ./tests/data/images/gif/02.gif |
||||
022dc66b5068404e88c618ce79d9eb5f *./tests/data/images/gif/02.gif |
||||
./tests/data/images/gif/%02d.gif CRC=0x032e0034 |
||||
./tests/data/images/gif/%02d.gif CRC=0xd742fb02 |
||||
81538 ./tests/data/images/gif/02.gif |
||||
e3392f49c55aa794d3dc49189f52f257 *./tests/data/images/gif/02.gif |
||||
./tests/data/images/gif/%02d.gif CRC=0x22d67c27 |
||||
63144 ./tests/data/images/gif/02.gif |
||||
022dc66b5068404e88c618ce79d9eb5f *./tests/data/images/gif/02.gif |
||||
./tests/data/images/gif/%02d.gif CRC=0x032e0034 |
||||
./tests/data/images/gif/%02d.gif CRC=0x51811243 |
||||
81538 ./tests/data/images/gif/02.gif |
||||
|
@ -1,40 +1,40 @@ |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret: 0 st:-1 flags:0 ts:-1.000000 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret: 0 st:-1 flags:1 ts: 1.894167 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret:-1 st: 0 flags:0 ts: 0.790000 |
||||
ret:-1 st: 0 flags:1 ts:-0.320000 |
||||
ret:-1 st:-1 flags:0 ts: 2.576668 |
||||
ret: 0 st:-1 flags:1 ts: 1.470835 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret:-1 st: 0 flags:0 ts: 0.370000 |
||||
ret:-1 st: 0 flags:1 ts:-0.740000 |
||||
ret:-1 st:-1 flags:0 ts: 2.153336 |
||||
ret: 0 st:-1 flags:1 ts: 1.047503 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret: 0 st: 0 flags:0 ts:-0.060000 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret: 0 st: 0 flags:1 ts: 2.840000 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret:-1 st:-1 flags:0 ts: 1.730004 |
||||
ret: 0 st:-1 flags:1 ts: 0.624171 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret: 0 st: 0 flags:0 ts:-0.480000 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret: 0 st: 0 flags:1 ts: 2.410000 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret:-1 st:-1 flags:0 ts: 1.306672 |
||||
ret: 0 st:-1 flags:1 ts: 0.200839 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret: 0 st: 0 flags:0 ts:-0.900000 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret: 0 st: 0 flags:1 ts: 1.990000 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret:-1 st:-1 flags:0 ts: 0.883340 |
||||
ret:-1 st:-1 flags:1 ts:-0.222493 |
||||
ret:-1 st: 0 flags:0 ts: 2.670000 |
||||
ret: 0 st: 0 flags:1 ts: 1.570000 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 |
||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 |
||||
ret:-1 st:-1 flags:0 ts: 0.460008 |
||||
ret:-1 st:-1 flags:1 ts:-0.645825 |
||||
|
Loading…
Reference in new issue