[FFmpeg-cvslog] Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 19 18:28:38 2014 +0200| [6ca0a976b2e68c9aa36d2e0806d31eee66d9f482] | committer: Michael Niedermayer

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 at gmx.at>

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