[FFmpeg-cvslog] Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 10 10:48:46 2015 +0100| [f063a0b33ddbafaa4a31e747bf4b445de1a8e8a8] | committer: Michael Niedermayer

Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56'

* commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56':
  avconv: do not abort immediately if initializing hwaccel fails

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

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