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