diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-16 00:40:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-16 00:40:57 +0200 |
| commit | 398b9ed28f589999e6135b367ef0180944159db6 (patch) | |
| tree | e428bd2efcec6dc28ed7892f02defd46bff3a2b3 /libpostproc | |
| parent | 41985cb0ab80c26a25f54a218a3885096b60ddcd (diff) | |
| parent | c0dcf89887f7fbdd7a8502bc7c715f50157562cb (diff) | |
| download | ffmpeg-398b9ed28f589999e6135b367ef0180944159db6.tar.gz | |
Merge commit 'c0dcf89887f7fbdd7a8502bc7c715f50157562cb'
* commit 'c0dcf89887f7fbdd7a8502bc7c715f50157562cb':
bfin: Match DEFUN_END macros to the right functions
Conflicts:
libavcodec/bfin/pixels_bfin.S
This bug seems not to have existed in our bfin code, thus
no change in this merge
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc')
0 files changed, 0 insertions, 0 deletions