Michael Niedermayer 5a55d5e445 Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'
* commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb':
  output example: allocate the audio frame only once

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26 23:22:08 +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