Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 11:48:22 +0000 (13:48 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 11:48:22 +0000 (13:48 +0200)
commit64ceeac26a441ede6eaf4bb99a5c3224b1803745
tree80e0f111260eb0b13a5ab17a30c5859d92c4d30e
parent1dd5f3340e002bf923fbfd4774afe3fafc6ad713
parentb9ece15a01782b4f301c0c139d1d7b20f848914c
Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/nullenc.c