Merge commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:48:58 +0000 (13:48 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:48:58 +0000 (13:48 +0200)
commitc36e85b3d9a13a223a621e7c322ce5903080cc4b
tree58d4a45e57f46e351605043a2f49c89d7f17be6f
parent88dbdf4845e31ef2a812b11e33aee823319fa442
parentae25413daf42a06f078ed81bb545ec23a8e0b482
Merge commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482'

* commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482':
  lavfi: do not exclude hwaccel formats from ff_all_formats()

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