Merge commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Apr 2015 19:31:06 +0000 (21:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Apr 2015 19:41:23 +0000 (21:41 +0200)
commitb112e25dde39a86befaed7e294facd8d860322da
tree738f301894647b5f6af9b9ab434ee0b12d280db4
parentc39b07ff282a4a7a0c5af1ee0c2958b5126387df
parenta78f5548d94f23ce23cece41edf0fe9d18926de6
Merge commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6'

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

See: 1907ff0a67edeb98d9153aac79f35961837ba3f6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c