OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5717562 3dc06b6)
Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 12:04:14 +0000 (14:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 12:04:14 +0000 (14:04 +0200)
commit83962004f7275a4ea98ca02398ae5dfff59e5fb7
tree38ba41a2750d220f95a58b7b3ca6cb540e7fddf5tree | snapshot
parent5717562c789f9be9c8e4bab7caec4df83f77cebecommit | diff
parent3dc06b6972cf389269e9c36ff0a4373f80f7149bcommit | diff
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>
libavcodec/rangecoder.c diff1 | diff2 | blob | history
tests/md5.sh diff1 | diff2 | blob | history
tests/tiny_psnr.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help