Michael Niedermayer 11991a7d90 Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'
* commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38':
  output example: use the new AVFrame API to allocate audio frames

Conflicts:
	doc/examples/muxing.c

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