Merge commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 14:43:24 +0000 (15:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 14:44:11 +0000 (15:44 +0100)
commit3328d105f76c21e5ca87471b8a8b51af9801dc17
treef3592304ee2db00ea2437d1105d39bff5c4d844f
parent76c63bc5d8567817c229adc6a6fcd9cbd902f0d8
parent50079a6aa93291e6dc9d9fb8d33da83f79e9311d
Merge commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d'

* commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d':
  lavc: do not leak the internal frame if opening the codec fails

Conflicts:
libavcodec/utils.c

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