diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:56:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:56:25 +0100 |
| commit | 3141b04c7fd46ca09acbc4a7b4d89788df273dd7 (patch) | |
| tree | abcef65d35b4384b8a96bfed45c0c5552c802069 /libavutil/downmix_info.c | |
| parent | 91a61c4c156dcc4d5a8ac579b6b5dd310deeaefe (diff) | |
| parent | da785231ea0b82b5c2526babbb2871c935b21a87 (diff) | |
| download | ffmpeg-3141b04c7fd46ca09acbc4a7b4d89788df273dd7.tar.gz | |
Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'
* commit 'da785231ea0b82b5c2526babbb2871c935b21a87':
bfin: Refactor duplicated assembly-related macros
Conflicts:
libavcodec/bfin/hpel_pixels_bfin.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/downmix_info.c')
0 files changed, 0 insertions, 0 deletions