| tag | 37b0c4a42a1ffc31a0dc48bb9575e50c107c5ccf | |
|---|---|---|
| tagger | Michael Niedermayer <michaelni@gmx.at> | Sun Dec 28 00:28:34 2014 +0100 |
| object | a2aeaff40f34cb54bef55240f9cb8046385087d7 |
Main development, master branch after release/1.1 branched off
| commit | a2aeaff40f34cb54bef55240f9cb8046385087d7 | [log] [tgz] |
|---|---|---|
| author | Michael Niedermayer <michaelni@gmx.at> | Sun Jan 06 23:41:19 2013 +0100 |
| committer | Michael Niedermayer <michaelni@gmx.at> | Sun Jan 06 23:41:19 2013 +0100 |
| tree | 8c7543ed2aa6030829ba402ec70d028864cd2dad | |
| parent | 58edabb198e0c881d8bb6ae8a88df037c24c71eb [diff] | |
| parent | aa15afb7ce850e2ac688efdef189df5da817a646 [diff] |
Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646' * commit 'aa15afb7ce850e2ac688efdef189df5da817a646': 4xm: simplify code with FFSWAP 4xm: return meaningful error codes Conflicts: libavcodec/4xm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>