diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 14:40:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 14:40:49 +0100 |
| commit | 32620691011186a0a3932bba8ddb078ce5312f22 (patch) | |
| tree | bad6b8eaaaf727a9ba94c38d8bceab5c8f50e1b1 /libavresample | |
| parent | 152c8fd856e505119c0a2040a9525715fc255c9a (diff) | |
| parent | e7373585f827d4ec05d952daa3877e8decfe3c08 (diff) | |
| download | ffmpeg-32620691011186a0a3932bba8ddb078ce5312f22.tar.gz | |
Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'
* commit 'e7373585f827d4ec05d952daa3877e8decfe3c08':
dsputil_template: Move bits that are used templatized into separate file
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions