diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 01:23:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 01:23:04 +0200 |
| commit | d35899ccce39e77a3f7fb667bdfc710c605d03a4 (patch) | |
| tree | a72ecac476a799f37c63fe704758f61044a999e8 /libavcodec/sonic.c | |
| parent | 40f3a87c10d5773eb66e09f4ed3d8197b1840863 (diff) | |
| parent | cb52a17cb62297802b0a77e5af9850d87c3f925b (diff) | |
| download | ffmpeg-d35899ccce39e77a3f7fb667bdfc710c605d03a4.tar.gz | |
Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'
* commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b':
dsputil: Move Bink-specific add_pixels8 to binkdsp
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sonic.c')
0 files changed, 0 insertions, 0 deletions