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 /tests/ref/lavf/alaw | |
| 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>
Diffstat (limited to 'tests/ref/lavf/alaw')
| -rw-r--r-- | tests/ref/lavf/alaw | 6 |
1 files changed, 3 insertions, 3 deletions
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 |