avfilter: Dont partially merge lists
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 00:31:04 +0000 (02:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Jul 2013 17:14:04 +0000 (19:14 +0200)
commitfe328f0807687ab5d418ff164b389f953102912f
treecc83d1a9be6444ddaa5a31078c7639f0b7465d5f
parent650355089cc4b38a57c88203c81f4896a98a5a7e
avfilter: Dont partially merge lists

This prevents the unneeded insertion of multiple aresample filters in some cases

The format merging is moved to avoid having to call the channel layout
merge twice. The channel layout merge code uses different structures and
is not compatible with the added dry run wrappers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfiltergraph.c