Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-28 02:57:49 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-05-28 03:00:10 +0400
commitb5657516b2b2cc302421b58151e0ab968a3cc737 (patch)
tree8575ae60fdade4a930a02a20f4bd70ebc4432070 /tests
parent5313d60dc0f2287f61a900a1f2b9d910eeb2bdbf (diff)
parent9767d7c092c890ecc5953452e8a951fd902dd67b (diff)
Merge commit '9767d7c092c890ecc5953452e8a951fd902dd67b'
* commit '9767d7c092c890ecc5953452e8a951fd902dd67b': oggenc: Flush after writing headers Conflicts: tests/ref/lavf/ogg Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rw-r--r--tests/ref/lavf-fate/ogg_vp32
-rw-r--r--tests/ref/lavf/ogg2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/lavf-fate/ogg_vp3 b/tests/ref/lavf-fate/ogg_vp3
index 9e9cc7ea6b..d3a6533206 100644
--- a/tests/ref/lavf-fate/ogg_vp3
+++ b/tests/ref/lavf-fate/ogg_vp3
@@ -1,3 +1,3 @@
-4bd51dac3194fa88ae33767c25b4b1e6 *./tests/data/lavf-fate/lavf.ogg
+5eff938810d2cc166dfbbd6bba5e710c *./tests/data/lavf-fate/lavf.ogg
417621 ./tests/data/lavf-fate/lavf.ogg
./tests/data/lavf-fate/lavf.ogg CRC=0x037e3e79
diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg
index a08fb5ed82..7ac7d0e5ef 100644
--- a/tests/ref/lavf/ogg
+++ b/tests/ref/lavf/ogg
@@ -1,3 +1,3 @@
-81b9366cacb23644c2803585dced9996 *./tests/data/lavf/lavf.ogg
+7802375589f2584d182d632c870951bc *./tests/data/lavf/lavf.ogg
13516 ./tests/data/lavf/lavf.ogg
./tests/data/lavf/lavf.ogg CRC=0x3a1da17e