Michael Niedermayer 8469c73576 Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26' ...

* commit '182d3f8221c23716ea4eafa460bdb94968f71f26':
  output example: rewrite encoding logic

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-06-27 00:57:04 +02:00

20 KiB

Raw Blame History

View Raw