* commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1': avconv: Avoid theoretical NULL dereferences See: d768f8f5cf Merged-by: Michael Niedermayer <michaelni@gmx.at>
d768f8f5cf