Commit 7a64f168 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '56de2897'

* commit '56de2897':
  h264: Fix memory leak on ff_h264_decode_init() failure

Conflicts:
	libavcodec/h264.c

See: 309a931aMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4ba01419 56de2897
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment