summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-16 14:04:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-16 14:04:14 +0200
commit83962004f7275a4ea98ca02398ae5dfff59e5fb7 (patch)
tree38ba41a2750d220f95a58b7b3ca6cb540e7fddf5 /Makefile
parent5717562c789f9be9c8e4bab7caec4df83f77cebe (diff)
parent3dc06b6972cf389269e9c36ff0a4373f80f7149b (diff)
downloadffmpeg-streaming-83962004f7275a4ea98ca02398ae5dfff59e5fb7.zip
ffmpeg-streaming-83962004f7275a4ea98ca02398ae5dfff59e5fb7.tar.gz
Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'
* commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b': tiny_psnr: check for specified sample size less than 1 fate: improve md5sum utility selection rangecoder-test: Drop timer output that clutters stderr Conflicts: tests/tiny_psnr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud