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)
* commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482':
  lavfi: do not exclude hwaccel formats from ff_all_formats()

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

Simple merge