[FFmpeg-cvslog] Merge commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 15:43:24 2014 +0100| [3328d105f76c21e5ca87471b8a8b51af9801dc17] | committer: Michael Niedermayer

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 at gmx.at>

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