[FFmpeg-cvslog] Merge commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 23 21:31:06 2015 +0200| [b112e25dde39a86befaed7e294facd8d860322da] | committer: Michael Niedermayer

Merge commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6'

* commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6':
  avcodec: Free the default avoptions on init failure

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

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