Michael Niedermayer 877716a79c Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'
* commit '6a927d7aaf5625e83a674072913b9e292a303fd1':
  output example: use a macro instead of a static variable

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26 23:58:00 +02:00
..
2014-06-03 10:58:19 -08:00
2014-05-23 23:30:21 +02:00
2014-06-18 14:55:28 +02:00
2014-05-28 03:52:50 +02:00
2014-06-20 10:21:31 -08:00
2013-08-29 22:52:04 +02:00