diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:26:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:31:51 +0200 |
| commit | 1e49439f04f4aeb45344e8753094d00ac4b1a5d6 (patch) | |
| tree | 621f7e9cdf461b997ef614f6c9c4c5657089e471 /tests/ref/seek/lavf-nut | |
| parent | c01bcce4959a208a4f6b66fd527760ed45cd29bb (diff) | |
| parent | 6656370b858329ca07a60a2de954d5e90daa0206 (diff) | |
| download | ffmpeg-1e49439f04f4aeb45344e8753094d00ac4b1a5d6.tar.gz | |
Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'
* commit '6656370b858329ca07a60a2de954d5e90daa0206':
avconv: set the "encoder" tag when transcoding
Conflicts:
ffmpeg.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/seek/lavf-nut')
| -rw-r--r-- | tests/ref/seek/lavf-nut | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/tests/ref/seek/lavf-nut b/tests/ref/seek/lavf-nut index ef47ceb5fb..73a3521c39 100644 --- a/tests/ref/seek/lavf-nut +++ b/tests/ref/seek/lavf-nut @@ -1,53 +1,53 @@ -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 339 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 385 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 ret: 0 st: 0 flags:0 ts: 0.788340 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 ret: 0 st: 0 flags:1 ts:-0.317500 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 ret: 0 st: 1 flags:0 ts: 2.576667 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 ret: 0 st: 1 flags:1 ts: 1.470839 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 ret: 0 st: 0 flags:0 ts: 2.153340 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 ret: 0 st: 0 flags:1 ts: 1.047500 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 ret: 0 st: 1 flags:0 ts:-0.058322 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 339 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 385 size: 208 ret: 0 st: 1 flags:1 ts: 2.835828 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 ret: 0 st: 0 flags:0 ts:-0.481660 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 ret: 0 st: 0 flags:1 ts: 2.412500 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 ret: 0 st: 1 flags:0 ts: 1.306667 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 ret: 0 st: 1 flags:1 ts: 0.200839 -ret: 0 st: 1 flags:1 dts: 0.182857 pts: 0.182857 pos: 71901 size: 209 +ret: 0 st: 1 flags:1 dts: 0.182857 pts: 0.182857 pos: 71947 size: 209 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 ret: 0 st: 0 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 ret: 0 st: 0 flags:1 ts:-0.222500 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 ret: 0 st: 1 flags:0 ts: 2.671678 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 ret: 0 st: 1 flags:1 ts: 1.565850 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 |