diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 15:53:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 15:53:33 +0100 |
| commit | b7f0d39d2629f0a1854adbda74c434a0754e9fa1 (patch) | |
| tree | ebdb1e398e512ac8d38fd34fe711409ad5166c88 /libavcodec/hevcpred_template.c | |
| parent | a49bdcdee5495c0e09019910a089e7c07963f6b0 (diff) | |
| parent | 55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6 (diff) | |
| download | ffmpeg-b7f0d39d2629f0a1854adbda74c434a0754e9fa1.tar.gz | |
Merge commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6'
* commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6':
hpeldsp_template: Move content to hpeldsp
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevcpred_template.c')
0 files changed, 0 insertions, 0 deletions