Merge commit '0d6605c7ef43f97a88950542af09078adef33b6d'

Browse Source

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

Conflicts:
	libavformat/mxfdec.c

See: b65570808cb3b518f969f9288fe643bca6361b8f
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2014-01-14 22:29:42 +01:00

parent e3c0fcadda 0d6605c7ef

commit bd8788ea17

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available