diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 11:41:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 11:41:23 +0200 |
| commit | fb2eeebf662ef3f3b0600da8471b3ff120afb652 (patch) | |
| tree | 3908430f44c91607240e9a0985bec2261dc4a813 /tests/ref | |
| parent | f9883a669c3df05a5c453428e080298c6511a17e (diff) | |
| parent | d3ea79e8a65ddad4da11813bb43c46701295f68c (diff) | |
| download | ffmpeg-fb2eeebf662ef3f3b0600da8471b3ff120afb652.tar.gz | |
Merge commit 'd3ea79e8a65ddad4da11813bb43c46701295f68c'
* commit 'd3ea79e8a65ddad4da11813bb43c46701295f68c':
FATE: drop the last truncated frame from the wma lossless test
Conflicts:
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref')
| -rw-r--r-- | tests/ref/fate/lossless-wma | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/fate/lossless-wma b/tests/ref/fate/lossless-wma index 5bea19b219..c4c8a37737 100644 --- a/tests/ref/fate/lossless-wma +++ b/tests/ref/fate/lossless-wma @@ -1 +1 @@ -35dc840f91cbcece02178d03c8f2fe26 +ab45f262b22030e908cb03f2cc8e89b5 |