diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:03:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:03:32 +0200 |
| commit | bf66016e4c03257707e62a0c525a82b9e4fdbdae (patch) | |
| tree | 58447edbac4f928569f73e943cfaebabd0bf3130 /libavcodec | |
| parent | f6dcd844ee65b187b7b352e3740c43724175b3e1 (diff) | |
| parent | c9f5fcd08c3a33bfb1b473705c792ab051e7428d (diff) | |
| download | ffmpeg-bf66016e4c03257707e62a0c525a82b9e4fdbdae.tar.gz | |
Merge commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d'
* commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d':
dsputil: Merge 9-10 bpp functions for get_pixels and draw_edge
Conflicts:
libavcodec/dsputil.c
No difference as this has been part of ffmpeg since a while and
the rebased commit does also not introduce new changes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions