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

Merge remote-tracking branch 'newdev/master' 


* newdev/master:
  ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED:  Remove arrozcru URL from documentation
  sndio support for playback and record

Conflicts:
	doc/faq.texi
	doc/general.texi

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 57e2ded4 991f3de1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1183 additions and 18 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