diff options
| author | Michael Niedermayer <[email protected]> | 2015-06-28 11:41:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-06-28 11:41:23 +0200 |
| commit | fb2eeebf662ef3f3b0600da8471b3ff120afb652 (patch) | |
| tree | 3908430f44c91607240e9a0985bec2261dc4a813 /libavcodec/arm/pixblockdsp_init_arm.c | |
| parent | f9883a669c3df05a5c453428e080298c6511a17e (diff) | |
| parent | d3ea79e8a65ddad4da11813bb43c46701295f68c (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavcodec/arm/pixblockdsp_init_arm.c')
0 files changed, 0 insertions, 0 deletions