Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
b4c75348
Commit
b4c75348
authored
Sep 28, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asfenc: avoid negative timestamps
Fixes Ticket1606 Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
94041feb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
28 deletions
+31
-28
asfenc.c
libavformat/asfenc.c
+3
-0
asf
tests/ref/lavf/asf
+1
-1
lavf_asf
tests/ref/seek/lavf_asf
+27
-27
No files found.
libavformat/asfenc.c
View file @
b4c75348
...
@@ -579,6 +579,9 @@ static int asf_write_header(AVFormatContext *s)
...
@@ -579,6 +579,9 @@ static int asf_write_header(AVFormatContext *s)
ffio_init_context
(
&
asf
->
pb
,
asf
->
packet_buf
,
s
->
packet_size
,
1
,
ffio_init_context
(
&
asf
->
pb
,
asf
->
packet_buf
,
s
->
packet_size
,
1
,
NULL
,
NULL
,
NULL
,
NULL
);
NULL
,
NULL
,
NULL
,
NULL
);
if
(
s
->
avoid_negative_ts
<
0
)
s
->
avoid_negative_ts
=
1
;
return
0
;
return
0
;
}
}
...
...
tests/ref/lavf/asf
View file @
b4c75348
6dfad1f3d0f2638ea46f08edaf482f26
*./tests/data/lavf/lavf.asf
3937dfece4b48c0cdd8f44bcab3cdd2d
*./tests/data/lavf/lavf.asf
333581 ./tests/data/lavf/lavf.asf
333581 ./tests/data/lavf/lavf.asf
./tests/data/lavf/lavf.asf CRC=0x51485213
./tests/data/lavf/lavf.asf CRC=0x51485213
tests/ref/seek/lavf_asf
View file @
b4c75348
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000
000 pos: 689 size: 208
ret: 0 st:-1 flags:0 ts:-1.000000
ret: 0 st:-1 flags:0 ts:-1.000000
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000
000 pos: 689 size: 208
ret: 0 st:-1 flags:1 ts: 1.894167
ret: 0 st:-1 flags:1 ts: 1.894167
ret: 0 st: 1 flags:1 dts: 0.4
59000 pts: 0.459
000 pos: 147889 size: 209
ret: 0 st: 1 flags:1 dts: 0.4
70000 pts: 0.470
000 pos: 147889 size: 209
ret: 0 st: 0 flags:0 ts: 0.788000
ret: 0 st: 0 flags:0 ts: 0.788000
ret: 0 st: 1 flags:1 dts: 0.4
59000 pts: 0.459
000 pos: 147889 size: 209
ret: 0 st: 1 flags:1 dts: 0.4
70000 pts: 0.470
000 pos: 147889 size: 209
ret: 0 st: 0 flags:1 ts:-0.317000
ret: 0 st: 0 flags:1 ts:-0.317000
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000
000 pos: 689 size: 208
ret: 0 st: 1 flags:0 ts: 2.577000
ret: 0 st: 1 flags:0 ts: 2.577000
ret: 0 st: 1 flags:1 dts: 0.9
82000 pts: 0.982
000 pos: 330289 size: 209
ret: 0 st: 1 flags:1 dts: 0.9
93000 pts: 0.993
000 pos: 330289 size: 209
ret: 0 st: 1 flags:1 ts: 1.471000
ret: 0 st: 1 flags:1 ts: 1.471000
ret: 0 st: 1 flags:1 dts: 0.9
82000 pts: 0.982
000 pos: 330289 size: 209
ret: 0 st: 1 flags:1 dts: 0.9
93000 pts: 0.993
000 pos: 330289 size: 209
ret: 0 st:-1 flags:0 ts: 0.365002
ret: 0 st:-1 flags:0 ts: 0.365002
ret: 0 st: 1 flags:1 dts: 0.4
59000 pts: 0.459
000 pos: 147889 size: 209
ret: 0 st: 1 flags:1 dts: 0.4
70000 pts: 0.470
000 pos: 147889 size: 209
ret: 0 st:-1 flags:1 ts:-0.740831
ret: 0 st:-1 flags:1 ts:-0.740831
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000
000 pos: 689 size: 208
ret: 0 st: 0 flags:0 ts: 2.153000
ret: 0 st: 0 flags:0 ts: 2.153000
ret: 0 st: 1 flags:1 dts: 0.9
30000 pts: 0.930
000 pos: 301489 size: 209
ret: 0 st: 1 flags:1 dts: 0.9
41000 pts: 0.941
000 pos: 301489 size: 209
ret: 0 st: 0 flags:1 ts: 1.048000
ret: 0 st: 0 flags:1 ts: 1.048000
ret: 0 st: 1 flags:1 dts: 0.9
30000 pts: 0.930
000 pos: 301489 size: 209
ret: 0 st: 1 flags:1 dts: 0.9
41000 pts: 0.941
000 pos: 301489 size: 209
ret: 0 st: 1 flags:0 ts:-0.058000
ret: 0 st: 1 flags:0 ts:-0.058000
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 ts: 2.836000
ret: 0 st: 1 flags:1 ts: 2.836000
ret: 0 st: 1 flags:1 dts: 0.9
82000 pts: 0.982
000 pos: 330289 size: 209
ret: 0 st: 1 flags:1 dts: 0.9
93000 pts: 0.993
000 pos: 330289 size: 209
ret: 0 st:-1 flags:0 ts: 1.730004
ret: 0 st:-1 flags:0 ts: 1.730004
ret: 0 st: 1 flags:1 dts: 0.9
30000 pts: 0.930
000 pos: 301489 size: 209
ret: 0 st: 1 flags:1 dts: 0.9
41000 pts: 0.941
000 pos: 301489 size: 209
ret: 0 st:-1 flags:1 ts: 0.624171
ret: 0 st:-1 flags:1 ts: 0.624171
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000
000 pos: 689 size: 208
ret: 0 st: 0 flags:0 ts:-0.482000
ret: 0 st: 0 flags:0 ts:-0.482000
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000
000 pos: 689 size: 208
ret: 0 st: 0 flags:1 ts: 2.413000
ret: 0 st: 0 flags:1 ts: 2.413000
ret: 0 st: 1 flags:1 dts: 0.9
30000 pts: 0.930
000 pos: 301489 size: 209
ret: 0 st: 1 flags:1 dts: 0.9
41000 pts: 0.941
000 pos: 301489 size: 209
ret: 0 st: 1 flags:0 ts: 1.307000
ret: 0 st: 1 flags:0 ts: 1.307000
ret: 0 st: 1 flags:1 dts: 0.9
82000 pts: 0.982
000 pos: 330289 size: 209
ret: 0 st: 1 flags:1 dts: 0.9
93000 pts: 0.993
000 pos: 330289 size: 209
ret: 0 st: 1 flags:1 ts: 0.201000
ret: 0 st: 1 flags:1 ts: 0.201000
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000
000 pos: 689 size: 208
ret: 0 st:-1 flags:0 ts:-0.904994
ret: 0 st:-1 flags:0 ts:-0.904994
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000
000 pos: 689 size: 208
ret: 0 st:-1 flags:1 ts: 1.989173
ret: 0 st:-1 flags:1 ts: 1.989173
ret: 0 st: 1 flags:1 dts: 0.9
30000 pts: 0.930
000 pos: 301489 size: 209
ret: 0 st: 1 flags:1 dts: 0.9
41000 pts: 0.941
000 pos: 301489 size: 209
ret: 0 st: 0 flags:0 ts: 0.883000
ret: 0 st: 0 flags:0 ts: 0.883000
ret: 0 st: 1 flags:1 dts: 0.4
59000 pts: 0.459
000 pos: 147889 size: 209
ret: 0 st: 1 flags:1 dts: 0.4
70000 pts: 0.470
000 pos: 147889 size: 209
ret: 0 st: 0 flags:1 ts:-0.222000
ret: 0 st: 0 flags:1 ts:-0.222000
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000
000 pos: 689 size: 208
ret: 0 st: 1 flags:0 ts: 2.672000
ret: 0 st: 1 flags:0 ts: 2.672000
ret: 0 st: 1 flags:1 dts: 0.9
82000 pts: 0.982
000 pos: 330289 size: 209
ret: 0 st: 1 flags:1 dts: 0.9
93000 pts: 0.993
000 pos: 330289 size: 209
ret: 0 st: 1 flags:1 ts: 1.566000
ret: 0 st: 1 flags:1 ts: 1.566000
ret: 0 st: 1 flags:1 dts: 0.9
82000 pts: 0.982
000 pos: 330289 size: 209
ret: 0 st: 1 flags:1 dts: 0.9
93000 pts: 0.993
000 pos: 330289 size: 209
ret: 0 st:-1 flags:0 ts: 0.460008
ret: 0 st:-1 flags:0 ts: 0.460008
ret: 0 st: 1 flags:1 dts: 0.4
59000 pts: 0.459
000 pos: 147889 size: 209
ret: 0 st: 1 flags:1 dts: 0.4
70000 pts: 0.470
000 pos: 147889 size: 209
ret: 0 st:-1 flags:1 ts:-0.645825
ret: 0 st:-1 flags:1 ts:-0.645825
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011
000 pos: 689 size: 208
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000
000 pos: 689 size: 208
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment