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

Merge commit 'c1fcfdec'


* commit 'c1fcfdec':
  rangecoder-test: Return in case of an error
  build: simplify enabling of compat objects

Conflicts:
	configure
	libavutil/Makefile

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 25f3827e c1fcfdec
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment