[FFmpeg-cvslog] Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Oct 14 13:48:22 2015 +0200| [64ceeac26a441ede6eaf4bb99a5c3224b1803745] | committer: Hendrik Leppkes

Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'

* commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c':
  nullenc: Use the wrapped avframe pseudo-encoder

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64ceeac26a441ede6eaf4bb99a5c3224b1803745
---