[FFmpeg-cvslog] Merge commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  5 00:55:04 2015 +0200| [bc0e65e7d0d0459622f0e0b5936efd5a6aa38b01] | committer: Michael Niedermayer

Merge commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1'

* commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1':
  avconv: Avoid theoretical NULL dereferences

See: d768f8f5cfe876cd8eedb045eeb87e307ac4a674
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc0e65e7d0d0459622f0e0b5936efd5a6aa38b01
---