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