Commit 371cb964 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '56f98e34'

* commit '56f98e34':
  output example: convert audio to the format supported by the encoder

Conflicts:
	doc/examples/muxing.c

Not merged as our example code already does that for what is needed
and we generate matching data for the rest. generating fixed data
and converting all parameters could be done of course.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7cf08655 56f98e34
Markdown is supported
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