diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 10:17:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 10:17:28 +0200 |
| commit | 2e789d165b2b1200a1bfc50dc2491ab0f41eb6ea (patch) | |
| tree | 34ad7b6502bea0080607859e0c3a79f03d1e2402 /libavcodec/sipr.c | |
| parent | 8d86cf4cfa2ef5fc75c3488a95eff1b733457def (diff) | |
| parent | 486f76f0298aa5002fb0b51616a6aca1e99bddd3 (diff) | |
| download | ffmpeg-2e789d165b2b1200a1bfc50dc2491ab0f41eb6ea.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Get rid of duplication between *_rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.c')
0 files changed, 0 insertions, 0 deletions