1. ffmpeg
  2. Commit b4c753487cf819213740d39c49b7bdc45338305d
Browse code

asfenc: avoid negative timestamps

Fixes Ticket1606

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2012/09/28 09:31:07
Showing 3 changed files
libavformat/asfenc.c
History View file @ b4c7534
... ... 
@@ -579,6 +579,9 @@ static int asf_write_header(AVFormatContext *s)
579 579 
     ffio_init_context(&asf->pb, asf->packet_buf, s->packet_size, 1,
580 580 
                   NULL, NULL, NULL, NULL);
581 581
582 
+    if (s->avoid_negative_ts < 0)
583 
+        s->avoid_negative_ts = 1;
584 
+
582 585 
     return 0;
583 586 
 }
584 587
tests/ref/lavf/asf
History View file @ b4c7534
... ... 
@@ -1,3 +1,3 @@
1 
-6dfad1f3d0f2638ea46f08edaf482f26 *./tests/data/lavf/lavf.asf
1 
+3937dfece4b48c0cdd8f44bcab3cdd2d *./tests/data/lavf/lavf.asf
2 2 
 333581 ./tests/data/lavf/lavf.asf
3 3 
 ./tests/data/lavf/lavf.asf CRC=0x51485213
tests/ref/seek/lavf_asf
History View file @ b4c7534
... ... 
@@ -1,53 +1,53 @@
1 
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
1 
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size:   208
2 2 
 ret: 0         st:-1 flags:0  ts:-1.000000
3 
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
3 
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size:   208
4 4 
 ret: 0         st:-1 flags:1  ts: 1.894167
5 
-ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147889 size:   209
5 
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147889 size:   209
6 6 
 ret: 0         st: 0 flags:0  ts: 0.788000
7 
-ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147889 size:   209
7 
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147889 size:   209
8 8 
 ret: 0         st: 0 flags:1  ts:-0.317000
9 
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
9 
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size:   208
10 10 
 ret: 0         st: 1 flags:0  ts: 2.577000
11 
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
11 
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330289 size:   209
12 12 
 ret: 0         st: 1 flags:1  ts: 1.471000
13 
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
13 
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330289 size:   209
14 14 
 ret: 0         st:-1 flags:0  ts: 0.365002
15 
-ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147889 size:   209
15 
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147889 size:   209
16 16 
 ret: 0         st:-1 flags:1  ts:-0.740831
17 
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
17 
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size:   208
18 18 
 ret: 0         st: 0 flags:0  ts: 2.153000
19 
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
19 
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301489 size:   209
20 20 
 ret: 0         st: 0 flags:1  ts: 1.048000
21 
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
21 
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301489 size:   209
22 22 
 ret: 0         st: 1 flags:0  ts:-0.058000
23 
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
23 
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size:   208
24 24 
 ret: 0         st: 1 flags:1  ts: 2.836000
25 
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
25 
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330289 size:   209
26 26 
 ret: 0         st:-1 flags:0  ts: 1.730004
27 
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
27 
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301489 size:   209
28 28 
 ret: 0         st:-1 flags:1  ts: 0.624171
29 
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
29 
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size:   208
30 30 
 ret: 0         st: 0 flags:0  ts:-0.482000
31 
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
31 
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size:   208
32 32 
 ret: 0         st: 0 flags:1  ts: 2.413000
33 
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
33 
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301489 size:   209
34 34 
 ret: 0         st: 1 flags:0  ts: 1.307000
35 
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
35 
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330289 size:   209
36 36 
 ret: 0         st: 1 flags:1  ts: 0.201000
37 
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
37 
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size:   208
38 38 
 ret: 0         st:-1 flags:0  ts:-0.904994
39 
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
39 
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size:   208
40 40 
 ret: 0         st:-1 flags:1  ts: 1.989173
41 
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
41 
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301489 size:   209
42 42 
 ret: 0         st: 0 flags:0  ts: 0.883000
43 
-ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147889 size:   209
43 
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147889 size:   209
44 44 
 ret: 0         st: 0 flags:1  ts:-0.222000
45 
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
45 
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size:   208
46 46 
 ret: 0         st: 1 flags:0  ts: 2.672000
47 
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
47 
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330289 size:   209
48 48 
 ret: 0         st: 1 flags:1  ts: 1.566000
49 
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
49 
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330289 size:   209
50 50 
 ret: 0         st:-1 flags:0  ts: 0.460008
51 
-ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147889 size:   209
51 
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147889 size:   209
52 52 
 ret: 0         st:-1 flags:1  ts:-0.645825
53 
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
53 
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size:   208