Merge commit '0e1ebfebc8326069732795698a82f3fea0742a54'

Browse Source

* commit '0e1ebfebc8326069732795698a82f3fea0742a54':
  4xm: drop unnecessary check

Conflicts:
	libavcodec/4xm.c

The check is currently redundant, it is for saftey left in place though

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

pull/95/head

Michael Niedermayer 10 years ago

parent 76bd8e16af 0e1ebfebc8

commit 7edb5eec4f

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