diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 15:08:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 15:08:46 +0100 |
| commit | 6967cf3c6c57dfdb831171f26f56fb1f521aed40 (patch) | |
| tree | 0454a3382771abf126d4a8a6cbe771e5a43827d6 /libavdevice/sndio_enc.c | |
| parent | e9c6b93bdaa600cd31f689218600baa999f8365e (diff) | |
| parent | 8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed (diff) | |
| download | ffmpeg-6967cf3c6c57dfdb831171f26f56fb1f521aed40.tar.gz | |
Merge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'
* commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed':
hpeldsp_template: Detemplatize the code
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/sndio_enc.c')
0 files changed, 0 insertions, 0 deletions