Merge commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0'

Browse Source

* commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0':
  af_compand: replace strtok_r() with av_get_token()

Conflicts:
	configure
	libavfilter/af_compand.c

Not merged as requested by ubitux
Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/60/head

Michael Niedermayer 11 years ago

parent cd88d89493 bc6461c286

commit f0ce3854fd

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