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