Merge commit 'f5fbbbc022'

Browse source

* commit 'f5fbbbc022':
  mxf: Drop unnecessary checks

Conflicts:
	libavformat/mxfdec.c

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

...

This commit is contained in:

Michael Niedermayer 2014-01-14 22:03:32 +01:00

parent d938a013af f5fbbbc022

commit 84ca7c28ce

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

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available