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

Merge commit '63fd0d86' 


* commit '63fd0d86':
  output example: allocate the audio frame only once

Conflicts:
	doc/examples/muxing.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents b9bfd888 63fd0d86
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 42 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