diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 23:41:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 23:41:19 +0100 |
| commit | a2aeaff40f34cb54bef55240f9cb8046385087d7 (patch) | |
| tree | 8c7543ed2aa6030829ba402ec70d028864cd2dad /libswresample/x86/audio_convert.asm | |
| parent | 58edabb198e0c881d8bb6ae8a88df037c24c71eb (diff) | |
| parent | aa15afb7ce850e2ac688efdef189df5da817a646 (diff) | |
| download | ffmpeg-a2aeaff40f34cb54bef55240f9cb8046385087d7.tar.gz | |
Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646'n1.2-dev
* commit 'aa15afb7ce850e2ac688efdef189df5da817a646':
4xm: simplify code with FFSWAP
4xm: return meaningful error codes
Conflicts:
libavcodec/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86/audio_convert.asm')
0 files changed, 0 insertions, 0 deletions