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)
* 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>
1  2 
libavcodec/utils.c

Simple merge