aboutsummaryrefslogtreecommitdiffstats
path: root/tools/zmqshell.py
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-28 11:41:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-28 11:41:23 +0200
commitfb2eeebf662ef3f3b0600da8471b3ff120afb652 (patch)
tree3908430f44c91607240e9a0985bec2261dc4a813 /tools/zmqshell.py
parentf9883a669c3df05a5c453428e080298c6511a17e (diff)
parentd3ea79e8a65ddad4da11813bb43c46701295f68c (diff)
downloadffmpeg-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 'tools/zmqshell.py')
0 files changed, 0 insertions, 0 deletions