Skip to content
Snippets Groups Projects
Commit a2aeaff4 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'aa15afb7' 


* commit 'aa15afb7':
  4xm: simplify code with FFSWAP
  4xm: return meaningful error codes

Conflicts:
	libavcodec/4xm.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 58edabb1 aa15afb7
No related branches found
Tags n1.2-dev
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 23 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment