diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:58:15 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:59:55 +0100 |
| commit | 6f69f7a8bf6a0d013985578df2ef42ee6b1c7994 (patch) | |
| tree | 0c2ec8349ff1763d5f48454b8b9f26374dbd80b0 /tests/ref/seek | |
| parent | 60b75186b2c878b6257b43c8fcc0b1356ada218e (diff) | |
| parent | 9200514ad8717c63f82101dc394f4378854325bf (diff) | |
Merge commit '9200514ad8717c63f82101dc394f4378854325bf'
* commit '9200514ad8717c63f82101dc394f4378854325bf':
lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
- Derek Buitenhuis <derek.buitenhuis@gmail.com>
- Hendrik Leppkes <h.leppkes@gmail.com>
- wm4 <nfxjfg@googlemail.com>
- Clément Bœsch <clement@stupeflix.com>
- James Almer <jamrial@gmail.com>
- Michael Niedermayer <michael@niedermayer.cc>
- Rostislav Pehlivanov <atomnuker@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'tests/ref/seek')
| -rw-r--r-- | tests/ref/seek/lavf-voc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ref/seek/lavf-voc b/tests/ref/seek/lavf-voc index 483c782e78..014c251129 100644 --- a/tests/ref/seek/lavf-voc +++ b/tests/ref/seek/lavf-voc @@ -4,13 +4,13 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 32 size: 1024 ret: 0 st:-1 flags:1 ts: 1.894167 ret:-EOF ret: 0 st: 0 flags:0 ts: 0.788330 -ret: 0 st: 0 flags:1 dts: 0.800773 pts: 0.800773 pos: 33956 size: 1024 +ret: 0 st: 0 flags:1 dts: 0.800773 pts: 0.800773 pos: 34984 size: 1024 ret:-1 st: 0 flags:1 ts:-0.317494 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 ret:-EOF ret: 0 st: 0 flags:0 ts: 0.365012 -ret: 0 st: 0 flags:1 dts: 0.376834 pts: 0.376834 pos: 15452 size: 1024 +ret: 0 st: 0 flags:1 dts: 0.376834 pts: 0.376834 pos: 16480 size: 1024 ret:-1 st: 0 flags:1 ts:-0.740834 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 @@ -21,24 +21,24 @@ ret: 0 st: 0 flags:1 ts: 2.835848 ret:-EOF 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.612356 pts: 0.612356 pos: 25732 size: 1024 +ret: 0 st: 0 flags:1 dts: 0.612356 pts: 0.612356 pos: 26760 size: 1024 ret: 0 st: 0 flags:0 ts:-0.481669 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 32 size: 1024 ret: 0 st: 0 flags:1 ts: 2.412507 ret:-EOF 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.188417 pts: 0.188417 pos: 7228 size: 1024 +ret: 0 st: 0 flags:1 dts: 0.188417 pts: 0.188417 pos: 8256 size: 1024 ret: 0 st: 0 flags:0 ts:-0.904986 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 32 size: 1024 ret: 0 st: 0 flags:1 ts: 1.989167 ret:-EOF ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.894981 pts: 0.894981 pos: 38068 size: 1024 +ret: 0 st: 0 flags:1 dts: 0.894981 pts: 0.894981 pos: 39096 size: 1024 ret:-1 st:-1 flags:1 ts:-0.222493 ret:-1 st: 0 flags:0 ts: 2.671673 ret: 0 st: 0 flags:1 ts: 1.565849 ret:-EOF ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.471043 pts: 0.471043 pos: 19564 size: 1024 +ret: 0 st: 0 flags:1 dts: 0.471043 pts: 0.471043 pos: 20592 size: 1024 ret:-1 st:-1 flags:1 ts:-0.645825 |