Merge commit '0d6605c7ef43f97a88950542af09078adef33b6d'

Browse Source

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

Conflicts:
	libavformat/mxfdec.c

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

pull/53/head

Michael Niedermayer 11 years ago

parent e3c0fcadda 0d6605c7ef

commit bd8788ea17

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available