Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:28:38 +0000 (18:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:30:37 +0000 (18:30 +0200)
commit6ca0a976b2e68c9aa36d2e0806d31eee66d9f482
tree88cad30e474dba5bf79f270b684ce9d50d34672f
parent74a8dbe1c405e041a16c44050d9dfc92aca90d33
parentd23fc8846d255e31896453136b4c77bc6d5e873f
Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'

* commit 'd23fc8846d255e31896453136b4c77bc6d5e873f':
  filtfmts: remove unused lavf include

A include for channel_layout.h, is added otherwise compile would break

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/filtfmts.c