Merge commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1'
* commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1': avconv: Avoid theoretical NULL dereferences See: d768f8f5cfe876cd8eedb045eeb87e307ac4a674 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
bc0e65e7d0