Merge commit '38d044429dabcd28928693240e955c6d4430cca9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 19:28:54 +0000 (21:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 19:30:37 +0000 (21:30 +0200)
commitc9083d85df460dd4661cdcd7d70fa7cb7b45a352
treeca95a300177dbf523080d51133e8d03a14fa43f3
parentaf75a8559969a0646dc4187e509245f3b5778771
parent38d044429dabcd28928693240e955c6d4430cca9
Merge commit '38d044429dabcd28928693240e955c6d4430cca9'

* commit '38d044429dabcd28928693240e955c6d4430cca9':
  output example: use the new AVFrame API for allocating the video frame

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/examples/muxing.c