Merge commit '182d3f82'

* commit '182d3f82': output example: rewrite encoding logic Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '182d3f82'
* commit '182d3f82': output example: rewrite encoding logic Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
8469c735 · Michael Niedermayer · 9a2850c2 · 182d3f82 · 8469c735
Commit 8469c735 authored Jun 26, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 108 additions and 80 deletions

muxing.c doc/examples/muxing.c +108 -80

No files found.
--- a/doc/examples/muxing.c
+++ b/doc/examples/muxing.c