diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 15:24:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 15:24:50 +0100 |
| commit | b4f64c58fc80585b9dc46f6ac6e385b2d55260a7 (patch) | |
| tree | 7ff1ebdb085a52c2dce75e6aefaedda443411eab /CREDITS | |
| parent | 6967cf3c6c57dfdb831171f26f56fb1f521aed40 (diff) | |
| parent | da5be235250a61d6994408b054e3e3acf2e0f90f (diff) | |
| download | ffmpeg-b4f64c58fc80585b9dc46f6ac6e385b2d55260a7.tar.gz | |
Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'
* commit 'da5be235250a61d6994408b054e3e3acf2e0f90f':
dsputil: Move RV40-specific bits into rv40dsp
Conflicts:
libavcodec/dsputil.c
libavcodec/rv40dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions