Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 20:44:35 +0000 (22:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 20:46:11 +0000 (22:46 +0200)
commit11991a7d9069dc80a0548d1521d227a3233deb1a
tree5cf7805f82cd7c6c5b68fd5c79fdc52cdad9e53e
parenta1c4635558cbb0a311022a0c74258118d09d260e
parent5e7b125b6ae36893dfd9cb5661c99b67363cbb38
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>
doc/examples/muxing.c