Commit bd8788ea authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '0d6605c7'

* commit '0d6605c7':
  mxf: Fix a possible leak of extradata

Conflicts:
	libavformat/mxfdec.c

See: b6557080Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e3c0fcad 0d6605c7
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