avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Feb 2013 14:00:01 +0000 (15:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Feb 2013 14:00:01 +0000 (15:00 +0100)
commitb97d61f924eef1a8930f80cd43d0733c12f67f35
treee6887b5380f1a7b8d755b543346146f75885bc3d
parentb9237aa7b090dc3aa99ad252c0c8b48a041b4cb2
avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha

Fixes Ticket1280

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