diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 14:59:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 14:59:50 +0100 |
| commit | e9c6b93bdaa600cd31f689218600baa999f8365e (patch) | |
| tree | 9b8b05c015e2b609481c35beb8729a053776ba6a /libavdevice/caca.c | |
| parent | 0371eaebcd1bdcd94e4c9fccf23969c5f49bb5d0 (diff) | |
| parent | 2c01ad8b206d326700974438f7193f22be416eb1 (diff) | |
| download | ffmpeg-e9c6b93bdaa600cd31f689218600baa999f8365e.tar.gz | |
Merge commit '2c01ad8b206d326700974438f7193f22be416eb1'
* commit '2c01ad8b206d326700974438f7193f22be416eb1':
dsputil_template: Detemplatize the code
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/caca.c')
0 files changed, 0 insertions, 0 deletions