Merge commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f'

Browse Source

* commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f':
  mxfdec: set extradata size

Conflicts:
	libavformat/mxfdec.c

no change as ffmpeg was not affected by this bug

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

...

This commit is contained in:

Michael Niedermayer 2013-11-29 22:12:36 +01:00

parent a677fb664a 95fd52c11b

commit f924d6e40b

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