diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 15:03:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 15:03:42 +0200 |
| commit | 3791741cf97f6803f7ec1beb8da025f1f779e845 (patch) | |
| tree | cebc35efc041ab95fbb91fe77eaf459724e97761 /presets | |
| parent | e98d3a7d51da037d06f5e3c113ef7c8b69c2467a (diff) | |
| parent | c9f8809ee4c576d5833865039bc1c85754448f67 (diff) | |
| download | ffmpeg-3791741cf97f6803f7ec1beb8da025f1f779e845.tar.gz | |
Merge commit 'c9f8809ee4c576d5833865039bc1c85754448f67'
* commit 'c9f8809ee4c576d5833865039bc1c85754448f67':
hevc/intra_pred: simplify neighboring sample derivation
Conflicts:
libavcodec/hevcpred_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions