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

Merge commit '74512f7e' 


* commit '74512f7e':
  8svx: Return proper error codes

Conflicts:
	libavcodec/8svx.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 098af260 74512f7e
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 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