diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 14:15:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 14:15:16 +0200 |
| commit | 8227d36bd3569efe0f1a4e3ad877e516497666a4 (patch) | |
| tree | 01ee1701eddc6a3033ef45b64fa64c6a52636d50 /libswresample/swresample-test.c | |
| parent | 83962004f7275a4ea98ca02398ae5dfff59e5fb7 (diff) | |
| parent | 07b3790d36266358e3bda19cec3b843e5129a986 (diff) | |
| download | ffmpeg-8227d36bd3569efe0f1a4e3ad877e516497666a4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: simplify linking tools with cmdutils.o
tiny_psnr: fix range calculation for sample size of 32 bits
Conflicts:
Makefile
tests/tiny_psnr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample-test.c')
0 files changed, 0 insertions, 0 deletions