diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 17:39:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 19:16:12 +0200 |
| commit | b11b7ceb8926703d1fac8adc3595a20ab7afb471 (patch) | |
| tree | 03b7e0b35c9f16fa103b0902734739f7fb9c4009 | |
| parent | 60ae776d04b69af23ea517cbf140bfd4bae7ddcb (diff) | |
| parent | dd9555e94b1481a6992ee89b285232e5abcf9089 (diff) | |
| download | ffmpeg-b11b7ceb8926703d1fac8adc3595a20ab7afb471.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
ffmpeg: remove obsolete workaround in trim insertion.
lavu/log: do not skip overwritten lines.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
39 files changed, 123 insertions, 127 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index c8164ed62d..e17c4a5988 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -290,10 +290,6 @@ static int insert_trim(int64_t start_time, int64_t duration, if (duration == INT64_MAX && start_time == AV_NOPTS_VALUE) return 0; - // Use with duration and without output starttime is buggy with trim filters - if (start_time == AV_NOPTS_VALUE) - return 0; - trim = avfilter_get_by_name(name); if (!trim) { av_log(NULL, AV_LOG_ERROR, "%s filter not present, cannot limit " diff --git a/libavutil/log.c b/libavutil/log.c index 29ad2d0c28..cde7c12e4d 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -224,7 +224,8 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) is_atty = isatty(2) ? 1 : -1; #endif - if (print_prefix && (flags & AV_LOG_SKIP_REPEATED) && !strcmp(line, prev) && *line){ + if (print_prefix && (flags & AV_LOG_SKIP_REPEATED) && !strcmp(line, prev) && + *line && line[strlen(line) - 1] != '\r'){ count++; if (is_atty == 1) fprintf(stderr, " Last message repeated %d times\r", count); diff --git a/tests/ref/fate/adpcm-ima-amv b/tests/ref/fate/adpcm-ima-amv index ca7a168135..4bd22af9b7 100644 --- a/tests/ref/fate/adpcm-ima-amv +++ b/tests/ref/fate/adpcm-ima-amv @@ -158,4 +158,4 @@ 0, 215010, 215010, 1380, 2760, 0xb83548f4 0, 216390, 216390, 1378, 2756, 0x22647962 0, 217768, 217768, 1378, 2756, 0x14ca54d3 -0, 219146, 219146, 1378, 2756, 0x58754b3a +0, 219146, 219146, 1354, 2708, 0x85e82e8d diff --git a/tests/ref/fate/adpcm-ms-mono b/tests/ref/fate/adpcm-ms-mono index 3bf44f82b4..c4567087bc 100644 --- a/tests/ref/fate/adpcm-ms-mono +++ b/tests/ref/fate/adpcm-ms-mono @@ -43,4 +43,4 @@ 0, 20500, 20500, 500, 1000, 0xf195eb44 0, 21000, 21000, 500, 1000, 0xa491f3ef 0, 21500, 21500, 500, 1000, 0x2c036e18 -0, 22000, 22000, 500, 1000, 0x52d65e2a +0, 22000, 22000, 50, 100, 0x0bd81f05 diff --git a/tests/ref/fate/bethsoft-vid b/tests/ref/fate/bethsoft-vid index f59823cea1..9f96da1e87 100644 --- a/tests/ref/fate/bethsoft-vid +++ b/tests/ref/fate/bethsoft-vid @@ -140,4 +140,4 @@ 0, 68, 68, 1, 192000, 0x3ec3cce1 1, 54760, 54760, 537, 1074, 0x142ce7ba 0, 69, 69, 1, 192000, 0x159313a8 -1, 55297, 55297, 925, 1850, 0x7ff682f7 +1, 55297, 55297, 258, 516, 0x98885b26 diff --git a/tests/ref/fate/cyberia-c93 b/tests/ref/fate/cyberia-c93 index 2c71e5023e..f02435c090 100644 --- a/tests/ref/fate/cyberia-c93 +++ b/tests/ref/fate/cyberia-c93 @@ -36,7 +36,7 @@ 0, 30, 30, 1, 184320, 0x54975910 0, 31, 31, 1, 184320, 0xf4857db9 0, 32, 32, 1, 184320, 0x82d18161 -1, 42552, 42552, 14184, 28368, 0x9101e519 +1, 42552, 42552, 5835, 11670, 0x04aa0b1e 0, 33, 33, 1, 184320, 0x06d93bd0 0, 34, 34, 1, 184320, 0xa4304c00 0, 35, 35, 1, 184320, 0x5f77d9cd diff --git a/tests/ref/fate/msvideo1-8bit b/tests/ref/fate/msvideo1-8bit index 6e6bc0bae0..74d54e8b5f 100644 --- a/tests/ref/fate/msvideo1-8bit +++ b/tests/ref/fate/msvideo1-8bit @@ -29,4 +29,3 @@ 0, 27, 27, 1, 57600, 0x4ec4a868 0, 28, 28, 1, 57600, 0x7db370a1 0, 29, 29, 1, 57600, 0x2b1e52f6 -0, 30, 30, 1, 57600, 0x2141467c diff --git a/tests/ref/lavf/aiff b/tests/ref/lavf/aiff index 2a5cd81090..c504c18c4a 100644 --- a/tests/ref/lavf/aiff +++ b/tests/ref/lavf/aiff @@ -1,3 +1,3 @@ -b0d42747a6fc99a5cd1ab0e861671f3a *./tests/data/lavf/lavf.aif -90182 ./tests/data/lavf/lavf.aif -./tests/data/lavf/lavf.aif CRC=0xf1ae5536 +2c129d88acef834e32869145fe792b9c *./tests/data/lavf/lavf.aif +88270 ./tests/data/lavf/lavf.aif +./tests/data/lavf/lavf.aif CRC=0x3a1da17e diff --git a/tests/ref/lavf/alaw b/tests/ref/lavf/alaw index 65bcf99036..d93d6fc0ee 100644 --- a/tests/ref/lavf/alaw +++ b/tests/ref/lavf/alaw @@ -1,3 +1,3 @@ -8bce9c3758b0d38da2e0718b6ab57fb4 *./tests/data/lavf/lavf.al -45056 ./tests/data/lavf/lavf.al -./tests/data/lavf/lavf.al CRC=0x5e6d372b +652d96e474869ddb01403743deb35117 *./tests/data/lavf/lavf.al +44100 ./tests/data/lavf/lavf.al +./tests/data/lavf/lavf.al CRC=0xf9643112 diff --git a/tests/ref/lavf/asf b/tests/ref/lavf/asf index cfa53dcc73..a90e5474fb 100644 --- a/tests/ref/lavf/asf +++ b/tests/ref/lavf/asf @@ -1,3 +1,3 @@ -3937dfece4b48c0cdd8f44bcab3cdd2d *./tests/data/lavf/lavf.asf +6bc7dc5698c3607fad8937d14560e50c *./tests/data/lavf/lavf.asf 333581 ./tests/data/lavf/lavf.asf -./tests/data/lavf/lavf.asf CRC=0x51485213 +./tests/data/lavf/lavf.asf CRC=0xf6340a10 diff --git a/tests/ref/lavf/ast b/tests/ref/lavf/ast index 72a9824f43..513c612e76 100644 --- a/tests/ref/lavf/ast +++ b/tests/ref/lavf/ast @@ -1,3 +1,3 @@ -7fa8cd2dd7453428e71930a7c65f7b62 *./tests/data/lavf/lavf.ast -181696 ./tests/data/lavf/lavf.ast -./tests/data/lavf/lavf.ast CRC=0x7bd585ff +07f5d23aa8bade984034f7005bd72947 *./tests/data/lavf/lavf.ast +177872 ./tests/data/lavf/lavf.ast +./tests/data/lavf/lavf.ast CRC=0xe61e3bd0 diff --git a/tests/ref/lavf/au b/tests/ref/lavf/au index b9b70a160a..ede4926a4c 100644 --- a/tests/ref/lavf/au +++ b/tests/ref/lavf/au @@ -1,3 +1,3 @@ -dc54f834a23ddc0c086a86f0cef898d7 *./tests/data/lavf/lavf.au -90144 ./tests/data/lavf/lavf.au -./tests/data/lavf/lavf.au CRC=0xf1ae5536 +aa5ec1f82ac07c653ffc527b0f0dc10d *./tests/data/lavf/lavf.au +88232 ./tests/data/lavf/lavf.au +./tests/data/lavf/lavf.au CRC=0x3a1da17e diff --git a/tests/ref/lavf/avi b/tests/ref/lavf/avi index 056d0c72fe..3cbb44f582 100644 --- a/tests/ref/lavf/avi +++ b/tests/ref/lavf/avi @@ -1,3 +1,3 @@ -feb26a85f820ede7e521a55be565f3b1 *./tests/data/lavf/lavf.avi +8d3a3554cbe21bc232603ca26b0c4d3e *./tests/data/lavf/lavf.avi 330806 ./tests/data/lavf/lavf.avi -./tests/data/lavf/lavf.avi CRC=0x4780846b +./tests/data/lavf/lavf.avi CRC=0xec6c3c68 diff --git a/tests/ref/lavf/caf b/tests/ref/lavf/caf index f2ae9c33c9..7b2a67d1c0 100644 --- a/tests/ref/lavf/caf +++ b/tests/ref/lavf/caf @@ -1,3 +1,3 @@ -6c97bfc8e455d5fb8b3b45806857a953 *./tests/data/lavf/lavf.caf -90235 ./tests/data/lavf/lavf.caf -./tests/data/lavf/lavf.caf CRC=0xf1ae5536 +c3c38cba600722c87c0e75bd0688b7fc *./tests/data/lavf/lavf.caf +88323 ./tests/data/lavf/lavf.caf +./tests/data/lavf/lavf.caf CRC=0x3a1da17e diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv_fmt index ed8c5cc14c..3c8e5b1e2e 100644 --- a/tests/ref/lavf/dv_fmt +++ b/tests/ref/lavf/dv_fmt @@ -1,9 +1,9 @@ 11be3e5caa2892236b3475c3f7807b76 *./tests/data/lavf/lavf.dv 3600000 ./tests/data/lavf/lavf.dv ./tests/data/lavf/lavf.dv CRC=0x25bdd732 -78db8504eefb660ed205b417157d4f44 *./tests/data/lavf/lavf.dv -3600000 ./tests/data/lavf/lavf.dv -./tests/data/lavf/lavf.dv CRC=0x1cec8738 +e9949bc767924e1e7d28856029fee024 *./tests/data/lavf/lavf.dv +3480000 ./tests/data/lavf/lavf.dv +./tests/data/lavf/lavf.dv CRC=0xc4f27ca7 87d3b20f656235671383a7eaa2f66330 *./tests/data/lavf/lavf.dv 3600000 ./tests/data/lavf/lavf.dv ./tests/data/lavf/lavf.dv CRC=0x0e868a82 diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm index 6f67365acd..7071866850 100644 --- a/tests/ref/lavf/ffm +++ b/tests/ref/lavf/ffm @@ -1,3 +1,3 @@ -d33fae310a7f6db1dc7fb74d1a9e0e6a *./tests/data/lavf/lavf.ffm +6f1443b952819cff1dae875529675e88 *./tests/data/lavf/lavf.ffm 376832 ./tests/data/lavf/lavf.ffm -./tests/data/lavf/lavf.ffm CRC=0x5b136bb1 +./tests/data/lavf/lavf.ffm CRC=0x000e23ae diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf index bdcbd1c134..14a2c87d4b 100644 --- a/tests/ref/lavf/gxf +++ b/tests/ref/lavf/gxf @@ -1,9 +1,9 @@ -a9672bb2a5b7927bf362f76bcce9bdf7 *./tests/data/lavf/lavf.gxf +9c96119322262ed2c43b34fd415233cc *./tests/data/lavf/lavf.gxf 795876 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0x147ff044 -2138952377f92d9c3a036f576197dbd7 *./tests/data/lavf/lavf.gxf +./tests/data/lavf/lavf.gxf CRC=0xda7cebbc +260acc1c88a1706e5aaa74eff99ac389 *./tests/data/lavf/lavf.gxf 794656 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0xe0199511 -f89a6b3e8a2c88eacafef7e283e6418b *./tests/data/lavf/lavf.gxf +./tests/data/lavf/lavf.gxf CRC=0x7f0c9089 +3cb8bab80b73a95f51e50989ccf06817 *./tests/data/lavf/lavf.gxf 795876 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0xd9d58865 +./tests/data/lavf/lavf.gxf CRC=0x5ade0285 diff --git a/tests/ref/lavf/ircam b/tests/ref/lavf/ircam index e29a7ada87..47e07098e5 100644 --- a/tests/ref/lavf/ircam +++ b/tests/ref/lavf/ircam @@ -1,3 +1,3 @@ -2cfae025de1b13098ef84a5e7f9947aa *./tests/data/lavf/lavf.ircam -91136 ./tests/data/lavf/lavf.ircam -./tests/data/lavf/lavf.ircam CRC=0xf1ae5536 +45d9a4667030e95d1d8fb6ab012f1aa0 *./tests/data/lavf/lavf.ircam +89224 ./tests/data/lavf/lavf.ircam +./tests/data/lavf/lavf.ircam CRC=0x3a1da17e diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 20e8e1c934..4bb97fd6bf 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,6 +1,6 @@ -b9557a7fa418db7692587b45d20f0d76 *./tests/data/lavf/lavf.mkv +6273e6c20231e89e167f99706388b1b5 *./tests/data/lavf/lavf.mkv 472542 ./tests/data/lavf/lavf.mkv -./tests/data/lavf/lavf.mkv CRC=0x4780846b -fd214bc74f0a21dfb36dcf9bb5777b86 *./tests/data/lavf/lavf.mkv +./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 +36633da729b88a171a0dfc969db23bcc *./tests/data/lavf/lavf.mkv 320274 ./tests/data/lavf/lavf.mkv -./tests/data/lavf/lavf.mkv CRC=0x4780846b +./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 diff --git a/tests/ref/lavf/mmf b/tests/ref/lavf/mmf index fea80152fe..fae95cadd5 100644 --- a/tests/ref/lavf/mmf +++ b/tests/ref/lavf/mmf @@ -1,3 +1,3 @@ -b165af6f2e5c6c1de733e9d3848bcebb *./tests/data/lavf/lavf.mmf +643fadf7482f6d937ed75ec4f508e4f1 *./tests/data/lavf/lavf.mmf 22611 ./tests/data/lavf/lavf.mmf -./tests/data/lavf/lavf.mmf CRC=0x03633476 +./tests/data/lavf/lavf.mmf CRC=0x8dea1388 diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index 2ed8ad02da..3b484ec4cf 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,12 +1,12 @@ -fcbe7806047914d9751fd9053009df69 *./tests/data/lavf/lavf.mov -367365 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 -72eac0051107a16e41d5263dab640f26 *./tests/data/lavf/lavf.mov -358455 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 -cf6ea2e8d4d16626d9dbd9e3fb802ce6 *./tests/data/lavf/lavf.mov -367549 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0x6e82384a -7c932d24837f46ef57d3e40a61331565 *./tests/data/lavf/lavf.mov -357837 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 +673de726034d2a44be176fa8166df376 *./tests/data/lavf/lavf.mov +366421 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xbb2b949b +e833d2e258ee20ef7c13470be8ea293b *./tests/data/lavf/lavf.mov +357511 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xbb2b949b +75fd61635a9707a8bed9a32958fe3275 *./tests/data/lavf/lavf.mov +366593 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xa9793231 +9bcbda2320a1434a3b9470389b45564e *./tests/data/lavf/lavf.mov +356893 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xbb2b949b diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg index 798ee03ae6..9feff66714 100644 --- a/tests/ref/lavf/mpg +++ b/tests/ref/lavf/mpg @@ -1,9 +1,9 @@ -ddc5cd5469eb8a0500f8a725baead5e5 *./tests/data/lavf/lavf.mpg +0a8c879bf813b6b758806088f29842dc *./tests/data/lavf/lavf.mpg 372736 ./tests/data/lavf/lavf.mpg -./tests/data/lavf/lavf.mpg CRC=0x5b136bb1 -7962eab004026dd7a8c0417470cdf574 *./tests/data/lavf/lavf.mpg +./tests/data/lavf/lavf.mpg CRC=0x000e23ae +d9446ae7b49de006a5a0f052ea9333ca *./tests/data/lavf/lavf.mpg 389120 ./tests/data/lavf/lavf.mpg -./tests/data/lavf/lavf.mpg CRC=0xbbbf92bc -bb22933de60193bce9032f67ce6fcc23 *./tests/data/lavf/lavf.mpg +./tests/data/lavf/lavf.mpg CRC=0x60ba4ab9 +edfef790122870cf4652e8a92ca558a0 *./tests/data/lavf/lavf.mpg 372736 ./tests/data/lavf/lavf.mpg -./tests/data/lavf/lavf.mpg CRC=0x5b136bb1 +./tests/data/lavf/lavf.mpg CRC=0x000e23ae diff --git a/tests/ref/lavf/mulaw b/tests/ref/lavf/mulaw index c6fa0588f0..bd540847de 100644 --- a/tests/ref/lavf/mulaw +++ b/tests/ref/lavf/mulaw @@ -1,3 +1,3 @@ -e64027a96ad5907ee281deff3286da0a *./tests/data/lavf/lavf.ul -45056 ./tests/data/lavf/lavf.ul -./tests/data/lavf/lavf.ul CRC=0xe028b50a +ad492935e361f830f2f8302aa102701d *./tests/data/lavf/lavf.ul +44100 ./tests/data/lavf/lavf.ul +./tests/data/lavf/lavf.ul CRC=0x4515fa26 diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index b1e46e9be8..b1918f58a6 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ 967f6ee9223c865328f4891465191108 *./tests/data/lavf/lavf.mxf 525369 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1 -7788939d349d09a7f9b546e59376a496 *./tests/data/lavf/lavf.mxf +a085845074129d732fc6adb5601e3b5e *./tests/data/lavf/lavf.mxf 560697 ./tests/data/lavf/lavf.mxf -./tests/data/lavf/lavf.mxf CRC=0xb69f428b +./tests/data/lavf/lavf.mxf CRC=0x3ff4178e ce535b606423d117675213b16275206a *./tests/data/lavf/lavf.mxf 525369 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1 diff --git a/tests/ref/lavf/nut b/tests/ref/lavf/nut index 72e59e8cf6..6c42a40d6e 100644 --- a/tests/ref/lavf/nut +++ b/tests/ref/lavf/nut @@ -1,3 +1,3 @@ -56c403dd91ae1dd4569348381b2b43a4 *./tests/data/lavf/lavf.nut +66386a488ee35e4592b605f63ef90a73 *./tests/data/lavf/lavf.nut 319902 ./tests/data/lavf/lavf.nut -./tests/data/lavf/lavf.nut CRC=0x4780846b +./tests/data/lavf/lavf.nut CRC=0xec6c3c68 diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg index 584e09bfbb..f8b58c4dbd 100644 --- a/tests/ref/lavf/ogg +++ b/tests/ref/lavf/ogg @@ -1,3 +1,3 @@ -ce1734741fa50c6c85f9cc8f410a720c *./tests/data/lavf/lavf.ogg -13985 ./tests/data/lavf/lavf.ogg -./tests/data/lavf/lavf.ogg CRC=0x37a143ea +304a201b4afa3583b206bdeef177ce6b *./tests/data/lavf/lavf.ogg +13495 ./tests/data/lavf/lavf.ogg +./tests/data/lavf/lavf.ogg CRC=0x3a1da17e diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm index d396e0000d..62e0a31739 100644 --- a/tests/ref/lavf/rm +++ b/tests/ref/lavf/rm @@ -1,2 +1,2 @@ -a3a875be9c528a2a4534a5a31230fdae *./tests/data/lavf/lavf.rm +e30681d05d6f3d24108d3614600bf116 *./tests/data/lavf/lavf.rm 346424 ./tests/data/lavf/lavf.rm diff --git a/tests/ref/lavf/rso b/tests/ref/lavf/rso index 648c2486d1..5878f434a1 100644 --- a/tests/ref/lavf/rso +++ b/tests/ref/lavf/rso @@ -1,3 +1,3 @@ -f41fd78f7df981802e7caeb23648b8c0 *./tests/data/lavf/lavf.rso -45064 ./tests/data/lavf/lavf.rso -./tests/data/lavf/lavf.rso CRC=0x74b2b546 +443b72346065d6318ca18c8395aa1d87 *./tests/data/lavf/lavf.rso +44108 ./tests/data/lavf/lavf.rso +./tests/data/lavf/lavf.rso CRC=0x298fd284 diff --git a/tests/ref/lavf/smjpeg b/tests/ref/lavf/smjpeg index 3e7e8edfa9..a2eeb97578 100644 --- a/tests/ref/lavf/smjpeg +++ b/tests/ref/lavf/smjpeg @@ -1,3 +1,3 @@ -2f6e613e9e257545e1048d57de92ba92 *./tests/data/lavf/lavf.smjpeg -791463 ./tests/data/lavf/lavf.smjpeg -./tests/data/lavf/lavf.smjpeg CRC=0x557714ff +a95982a2d390f4dcdc72a41d8920abb9 *./tests/data/lavf/lavf.smjpeg +789551 ./tests/data/lavf/lavf.smjpeg +./tests/data/lavf/lavf.smjpeg CRC=0x54bf6147 diff --git a/tests/ref/lavf/sox b/tests/ref/lavf/sox index 0026480001..fc368b1357 100644 --- a/tests/ref/lavf/sox +++ b/tests/ref/lavf/sox @@ -1,3 +1,3 @@ -e6f278256f145b69ed06f35b8d3585c1 *./tests/data/lavf/lavf.sox -180256 ./tests/data/lavf/lavf.sox -./tests/data/lavf/lavf.sox CRC=0xf1ae5536 +683635d5cb1344e44fa96df90c3a993c *./tests/data/lavf/lavf.sox +176432 ./tests/data/lavf/lavf.sox +./tests/data/lavf/lavf.sox CRC=0x3a1da17e diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts index d795c27dbc..02921edfad 100644 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -04ba219e6f56f7b0fa4a47765323d204 *./tests/data/lavf/lavf.ts +a876e6bde8a2e8c7eca878869433ad3b *./tests/data/lavf/lavf.ts 407020 ./tests/data/lavf/lavf.ts -./tests/data/lavf/lavf.ts CRC=0xcc2dc628 +./tests/data/lavf/lavf.ts CRC=0x71287e25 diff --git a/tests/ref/lavf/voc b/tests/ref/lavf/voc index 062da63638..ded8af7227 100644 --- a/tests/ref/lavf/voc +++ b/tests/ref/lavf/voc @@ -1,3 +1,3 @@ -e4cefbeb4c20f5735de1877fbcfd8d1d *./tests/data/lavf/lavf.voc -45261 ./tests/data/lavf/lavf.voc -./tests/data/lavf/lavf.voc CRC=0x74b2b546 +bb5ad96a5e1b35683d50bf18115db821 *./tests/data/lavf/lavf.voc +44305 ./tests/data/lavf/lavf.voc +./tests/data/lavf/lavf.voc CRC=0x298fd284 diff --git a/tests/ref/lavf/voc_s16 b/tests/ref/lavf/voc_s16 index 23e5aab3c3..d026090aff 100644 --- a/tests/ref/lavf/voc_s16 +++ b/tests/ref/lavf/voc_s16 @@ -1,3 +1,3 @@ -a8225786fdbf5a2a19d1eeaf15f28632 *./tests/data/lavf/lavf.s16.voc -180439 ./tests/data/lavf/lavf.s16.voc -./tests/data/lavf/lavf.s16.voc CRC=0x7bd585ff +db9fa22ff71992bd8b6cc80047223c92 *./tests/data/lavf/lavf.s16.voc +176615 ./tests/data/lavf/lavf.s16.voc +./tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0 diff --git a/tests/ref/lavf/w64 b/tests/ref/lavf/w64 index 9acda831e7..7da4f095b5 100644 --- a/tests/ref/lavf/w64 +++ b/tests/ref/lavf/w64 @@ -1,3 +1,3 @@ -420bf38762386ae2ba8bf2e85b6cc7f2 *./tests/data/lavf/lavf.w64 -90224 ./tests/data/lavf/lavf.w64 -./tests/data/lavf/lavf.w64 CRC=0xf1ae5536 +062b91c34d570a90af8d55427804878e *./tests/data/lavf/lavf.w64 +88312 ./tests/data/lavf/lavf.w64 +./tests/data/lavf/lavf.w64 CRC=0x3a1da17e diff --git a/tests/ref/lavf/wav b/tests/ref/lavf/wav index cc8ec1d929..600c26a4cd 100644 --- a/tests/ref/lavf/wav +++ b/tests/ref/lavf/wav @@ -1,3 +1,3 @@ -c4afa6eafac5243aa1c202397789ccb8 *./tests/data/lavf/lavf.wav -90188 ./tests/data/lavf/lavf.wav -./tests/data/lavf/lavf.wav CRC=0xf1ae5536 +eb5a869456d2e9107bb195c8c99be1a1 *./tests/data/lavf/lavf.wav +88276 ./tests/data/lavf/lavf.wav +./tests/data/lavf/lavf.wav CRC=0x3a1da17e diff --git a/tests/ref/lavf/wtv b/tests/ref/lavf/wtv index f54f8629f5..fe1b83c1ea 100644 --- a/tests/ref/lavf/wtv +++ b/tests/ref/lavf/wtv @@ -1,3 +1,3 @@ -237211f6aa3df9da2dfe0f7d5b8ba85c *./tests/data/lavf/lavf.wtv +98dd5205889313542da71351fbaf4172 *./tests/data/lavf/lavf.wtv 413696 ./tests/data/lavf/lavf.wtv -./tests/data/lavf/lavf.wtv CRC=0xcc2dc628 +./tests/data/lavf/lavf.wtv CRC=0x71287e25 diff --git a/tests/ref/seek/lavf-alaw b/tests/ref/seek/lavf-alaw index 84661ece8a..4b1f8fbc02 100644 --- a/tests/ref/seek/lavf-alaw +++ b/tests/ref/seek/lavf-alaw @@ -38,7 +38,7 @@ ret: 0 st: 0 flags:1 dts: 0.200816 pts: 0.200816 pos: 4428 size: 1024 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 1024 ret: 0 st: 0 flags:1 ts: 1.989161 -ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 1024 +ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 239 ret: 0 st:-1 flags:0 ts: 0.883340 ret: 0 st: 0 flags:1 dts: 0.883356 pts: 0.883356 pos: 19478 size: 1024 ret: 0 st:-1 flags:1 ts:-0.222493 diff --git a/tests/ref/seek/lavf-mov b/tests/ref/seek/lavf-mov index 9563a0d3a5..93a9a23422 100644 --- a/tests/ref/seek/lavf-mov +++ b/tests/ref/seek/lavf-mov @@ -1,48 +1,48 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret: 0 st: 0 flags:0 ts: 0.788359 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317500 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret:-1 st: 1 flags:0 ts: 2.576667 ret: 0 st: 1 flags:1 ts: 1.470839 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165209 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165221 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153359 ret: 0 st: 0 flags:1 ts: 1.047500 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret: 0 st: 1 flags:0 ts:-0.058322 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st: 1 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164185 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164197 size: 1024 ret: 0 st: 0 flags:0 ts:-0.481641 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st: 0 flags:1 ts: 2.412500 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret:-1 st: 1 flags:0 ts: 1.306667 ret: 0 st: 1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret: 0 st: 0 flags:0 ts: 0.883359 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222500 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret:-1 st: 1 flags:0 ts: 2.671678 ret: 0 st: 1 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165209 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165221 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 diff --git a/tests/ref/seek/lavf-mulaw b/tests/ref/seek/lavf-mulaw index 84661ece8a..4b1f8fbc02 100644 --- a/tests/ref/seek/lavf-mulaw +++ b/tests/ref/seek/lavf-mulaw @@ -38,7 +38,7 @@ ret: 0 st: 0 flags:1 dts: 0.200816 pts: 0.200816 pos: 4428 size: 1024 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 1024 ret: 0 st: 0 flags:1 ts: 1.989161 -ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 1024 +ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 239 ret: 0 st:-1 flags:0 ts: 0.883340 ret: 0 st: 0 flags:1 dts: 0.883356 pts: 0.883356 pos: 19478 size: 1024 ret: 0 st:-1 flags:1 ts:-0.222493 |