diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-26 11:01:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-26 11:10:57 +0200 |
| commit | 721ffc691ab40420e5a4cdf4c3580f4aa33cde0f (patch) | |
| tree | fa9e615edbaf441c16b217d1b31ee68b28ec62d3 /libavfilter/af_join.c | |
| parent | c4bf74022562036bac3f53f4d5b8b1787d904c24 (diff) | |
| parent | 74685f6783e77f2545d48bd2124945ad5be39982 (diff) | |
| download | ffmpeg-721ffc691ab40420e5a4cdf4c3580f4aa33cde0f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* commit '74685f6783e77f2545d48bd2124945ad5be39982':
x86: Rename dsputil_rnd_template.c to rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_join.c')
0 files changed, 0 insertions, 0 deletions